From 2bc8c6c8452219d0956febf848d2242e2804ae4a Mon Sep 17 00:00:00 2001 From: tim-s-ccs Date: Mon, 15 Apr 2024 11:43:53 +0100 Subject: [PATCH] Remove the old Dockerfile and set the version for new AWS Dockerfiles --- Dockerfile | 1 - docker-aws/Dockerfile.http | 4 ++-- docker-aws/Dockerfile.wsgi | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index dbc9c6a0f..000000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM digitalmarketplace/base-frontend:12.0.1 diff --git a/docker-aws/Dockerfile.http b/docker-aws/Dockerfile.http index 5cf5a4526..853f63cad 100644 --- a/docker-aws/Dockerfile.http +++ b/docker-aws/Dockerfile.http @@ -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 diff --git a/docker-aws/Dockerfile.wsgi b/docker-aws/Dockerfile.wsgi index 267f9f929..894bfa0d6 100644 --- a/docker-aws/Dockerfile.wsgi +++ b/docker-aws/Dockerfile.wsgi @@ -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