Skip to content

Commit

Permalink
Merge pull request #1745 from Crown-Commercial-Service/target-version…
Browse files Browse the repository at this point in the history
…-for-docker-file

Remove the old Dockerfile and set the version for new AWS Dockerfiles
  • Loading branch information
tim-s-ccs committed Apr 15, 2024
2 parents 3799259 + 2bc8c6c commit a3d5ce3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions docker-aws/Dockerfile.http
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:1.0.0 as buildstatic
COPY . .
RUN ./scripts/build.sh

FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-frontend:latest
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-frontend:1.0.0
COPY --from=buildstatic ${APP_DIR}/app/static ${APP_DIR}/static
4 changes: 2 additions & 2 deletions docker-aws/Dockerfile.wsgi
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Base builds are defined in https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-aws-docker-base
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:latest as buildstatic
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-http-buildstatic:1.0.0 as buildstatic
COPY . ${APP_DIR}
RUN ./scripts/build.sh

FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-wsgi:latest
FROM 473251818902.dkr.ecr.eu-west-2.amazonaws.com/dmp-base-wsgi:1.0.0
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
Expand Down

0 comments on commit a3d5ce3

Please sign in to comment.