From 2cd811f23eb5b89717b433d8308d0c8572457aef Mon Sep 17 00:00:00 2001 From: Garrett Martin Date: Wed, 27 May 2020 21:00:14 +0000 Subject: [PATCH] Use new milmove-app docker image with upgraded node version --- Dockerfile.local | 2 +- Dockerfile.migrations_local | 2 +- Dockerfile.storybook_local | 2 +- Dockerfile.tasks_local | 2 +- Dockerfile.tools_local | 2 +- docker-compose.circle.yml | 2 +- scripts/gen-assets | 2 +- scripts/gen-server | 2 +- scripts/pre-commit-swagger-validate | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index 20f4d24bcdf..310d1fbb400 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -2,7 +2,7 @@ # BUILDER # ########### -FROM milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 as builder +FROM milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a as builder ENV CIRCLECI=true diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local index 70906a56e2b..1b8eee1f2ec 100644 --- a/Dockerfile.migrations_local +++ b/Dockerfile.migrations_local @@ -2,7 +2,7 @@ # BUILDER # ########### -FROM milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 as builder +FROM milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a as builder ENV CIRCLECI=true diff --git a/Dockerfile.storybook_local b/Dockerfile.storybook_local index 6d34df6a447..1815944282d 100644 --- a/Dockerfile.storybook_local +++ b/Dockerfile.storybook_local @@ -1,4 +1,4 @@ -FROM milmove/circleci-docker:milmove-app-browsers-ce60239ffca056a033af6330daf922a5a9635066 +FROM milmove/circleci-docker:milmove-app-browsers-c272e99bc356ce400a42526c5e5694e6cae3c68a EXPOSE 6006 diff --git a/Dockerfile.tasks_local b/Dockerfile.tasks_local index dbdf9b36b83..83406245128 100644 --- a/Dockerfile.tasks_local +++ b/Dockerfile.tasks_local @@ -2,7 +2,7 @@ # BUILDER # ########### -FROM milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 as builder +FROM milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a as builder ENV CIRCLECI=true diff --git a/Dockerfile.tools_local b/Dockerfile.tools_local index 8b22f546440..6da2d7efd8e 100644 --- a/Dockerfile.tools_local +++ b/Dockerfile.tools_local @@ -2,7 +2,7 @@ # BUILDER # ########### -FROM milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 as builder +FROM milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a as builder ENV CIRCLECI=true diff --git a/docker-compose.circle.yml b/docker-compose.circle.yml index 654a57254a0..ec9426f6001 100644 --- a/docker-compose.circle.yml +++ b/docker-compose.circle.yml @@ -17,7 +17,7 @@ services: server_test: depends_on: - database - image: milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 + image: milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a deploy: resources: limits: diff --git a/scripts/gen-assets b/scripts/gen-assets index 49ece12e83d..2a40be17a4e 100755 --- a/scripts/gen-assets +++ b/scripts/gen-assets @@ -24,7 +24,7 @@ if [ -n "${CIRCLECI+x}" ]; then else # Locally we need to download the docker image to get the binary echo "RUNNING LOCALLY" - image=milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 + image=milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a docker pull -q "${image}" docker run -it --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" go-bindata -modtime "${modtime}" -o "${output_file}" -pkg "${package_name}" "${input_dirs[@]}" fi diff --git a/scripts/gen-server b/scripts/gen-server index 578ba204597..107a769fec0 100755 --- a/scripts/gen-server +++ b/scripts/gen-server @@ -8,7 +8,7 @@ if [ -n "${CIRCLECI+x}" ]; then echo "CircleCI has swagger built in" else # Locally we need to download the docker image to get the binary - image=milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 + image=milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a docker pull -q "${image}" fi diff --git a/scripts/pre-commit-swagger-validate b/scripts/pre-commit-swagger-validate index caf398f317a..b1e07fc4e18 100755 --- a/scripts/pre-commit-swagger-validate +++ b/scripts/pre-commit-swagger-validate @@ -14,7 +14,7 @@ if [ "$UNAME_S" == "Linux" ]; then /usr/local/bin/swagger validate "${filename}" else # Locally we need to download the docker image to get the binary - image=milmove/circleci-docker:milmove-app-ce60239ffca056a033af6330daf922a5a9635066 + image=milmove/circleci-docker:milmove-app-c272e99bc356ce400a42526c5e5694e6cae3c68a docker pull -q "${image}" docker run --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" swagger validate "${filename}" fi