Merge pull request #566 from Crown-Commercial-Service/alpine-image

Alpine image
Crown-Commercial-Service · Jan 16, 2024 · 55558ee · 55558ee
2 parents 9e7f579 + 41dc97d
commit 55558ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/docker-aws/Dockerfile.http b/docker-aws/Dockerfile.http
@@ -1,5 +1,7 @@
 # Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
-FROM digitalmarketplace/dmp-http-buildstatic:1.0.0 as buildstatic
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
+COPY . .
+RUN ./scripts/build.sh
 
-FROM digitalmarketplace/dmp-http-frontend:1.0.0
-COPY --from=buildstatic ${APP_DIR}/app/static ${APP_DIR}/static
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-frontend:latest
+COPY --from=buildstatic ${APP_DIR}/app/static ${APP_DIR}/static
diff --git a/docker-aws/Dockerfile.wsgi b/docker-aws/Dockerfile.wsgi
@@ -1,7 +1,9 @@
 # Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
-FROM digitalmarketplace/dmp-http-buildstatic:1.0.0 as buildstatic
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
+COPY . ${APP_DIR}
+RUN ./scripts/build.sh
 
-FROM digitalmarketplace/dmp-wsgi:1.0.0
+FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-wsgi:latest
 COPY --from=buildstatic ${APP_DIR}/node_modules/digitalmarketplace-govuk-frontend ${APP_DIR}/node_modules/digitalmarketplace-govuk-frontend
 COPY --from=buildstatic ${APP_DIR}/node_modules/govuk-frontend ${APP_DIR}/node_modules/govuk-frontend
 COPY --from=buildstatic ${APP_DIR}/app/content ${APP_DIR}/app/content