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

Use Alpine image and bump PyYaml version

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

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

requirements-dev.txt

@@ -66,7 +66,7 @@ python-dateutil==2.8.1
     #   freezegun
 python-dotenv==0.10.3
     # via -r requirements-dev.in
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via
     #   -c requirements.txt
     #   watchdog

requirements.txt

@@ -110,7 +110,7 @@ python-json-logger==0.1.11
     # via digitalmarketplace-utils
 pytz==2019.3
     # via digitalmarketplace-utils
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via digitalmarketplace-content-loader
 redis==3.5.3
     # via digitalmarketplace-utils