Updated milmove-app hash to point to image with go-swagger 0.28.0; up…

…dated nix config
transcom · Jan 5, 2022 · 3427259 · 3427259
1 parent 5d800bf
commit 3427259
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,7 +13,7 @@ version: '2.1'
 
 # References for variables shared across the file
 references:
-  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
+  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
 
   # the cypress image to use
   cypress: &cypress milmove/circleci-docker:milmove-cypress-cf2249e54c69b52625f1ab04eb79f37381d0d3bf

diff --git a/Dockerfile.local b/Dockerfile.local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.migrations_local b/Dockerfile.migrations_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.reviewapp b/Dockerfile.reviewapp
@@ -3,7 +3,7 @@
 ###########
 
 # Base builder so the ci build image hash is referenced once
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 ENV CIRCLECI=docker
 ENV REACT_APP_NODE_ENV=development

diff --git a/Dockerfile.tasks_local b/Dockerfile.tasks_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.tools_local b/Dockerfile.tools_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 ENV CIRCLECI=true
 

diff --git a/Dockerfile.webhook_client b/Dockerfile.webhook_client
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Dockerfile.webhook_client_dp3 b/Dockerfile.webhook_client_dp3
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Dockerfile.webhook_client_local b/Dockerfile.webhook_client_local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder
+FROM milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Makefile b/Makefile
@@ -1122,8 +1122,8 @@ pretty: gofmt ## Run code through JS and Golang formatters
 
 .PHONY: docker_circleci
 docker_circleci: ## Run CircleCI container locally with project mounted
-	docker pull milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
-	docker run -it --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf bash
+	docker pull milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
+	docker run -it --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212 bash
 
 .PHONY: prune_images
 prune_images:  ## Prune docker images

diff --git a/nix/default.nix b/nix/default.nix
@@ -147,10 +147,10 @@ in buildEnv {
 
     (import (builtins.fetchGit {
       # Descriptive name to make the store path easier to identify
-      name = "go-swagger-0.27.0";
+      name = "go-swagger-0.28.0";
       url = "https://github.com/NixOS/nixpkgs/";
       ref = "refs/heads/nixpkgs-unstable";
-      rev = "9c3de9dd586506a7694fc9f19d459ad381239e34";
+      rev = "a2445c740efa0f5a34c1756dd28812e1b12d0b24";
     }) {}).go-swagger
 
     (import (builtins.fetchGit {

diff --git 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-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
+  image=milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
   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
@@ -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-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
+  image=milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
   docker pull -q "${image}"
 fi
 

diff --git 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-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
+  image=milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
   docker pull -q "${image}"
   docker run --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" swagger validate "${filename}"
 fi
diff --git a/scripts/run-e2e-test-docker b/scripts/run-e2e-test-docker
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-circleci_build_image=milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
+circleci_build_image=milmove/circleci-docker:milmove-app-cde63c429c58d28362cd7a11300101970cf39212
 
 set -eux -o pipefail