Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the old Dockerfile and set the version for new AWS Dockerfiles #1745

Merged
merged 1 commit into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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