Update for go 1.17.2

transcom · Oct 14, 2021 · 91f272b · 91f272b
1 parent 6867083
commit 91f272b
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 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-4b09540d82b4496c79089a3228ced3142ed83c40
+  circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d
 
   postgres: &postgres postgres:12.7
 

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-golang 1.17.1
+golang 1.17.2
diff --git a/Dockerfile.local b/Dockerfile.local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d 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-4b09540d82b4496c79089a3228ced3142ed83c40 as builder
+FROM milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

diff --git a/Makefile b/Makefile
@@ -1104,7 +1104,7 @@ 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-4b09540d82b4496c79089a3228ced3142ed83c40
+	docker pull milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d
 	docker run -it --rm=true -v $(PWD):$(PWD) -w $(PWD) -e CIRCLECI=1 milmove/circleci-docker:milmove-app bash
 
 .PHONY: prune_images

diff --git a/README.md b/README.md
@@ -1091,7 +1091,7 @@ To get Goland to play nicely with `nix`, there's a few things you can set up:
 
 * Update `GOROOT` to `/nix/var/nix/profiles/mymove/bin/go`
   * Note that once you add it, Goland will resolve it to the actual path (the one above is a link), so it’ll look
-    something like `/nix/store/rv16prybnsmav8w1sqdgr80jcwsja98q-go-1.16.6/bin/go`
+    something like `/nix/store/rv16prybnsmav8w1sqdgr80jcwsja98q-go-1.17.2/bin/go`
 * Update `GOPATH` to point to the `.gopath` dir in the `mymove` repo
   * You may need to create the `.gopath` dir yourself.
 * Update Node and NPM:

diff --git a/cypress/Dockerfile.cypress b/cypress/Dockerfile.cypress
@@ -1,4 +1,4 @@
-FROM milmove/circleci-docker:milmove-cypress-fb9f5283964524152d84a20fe58df13bb605cb37
+FROM milmove/circleci-docker:milmove-cypress-96cac8d8f0103661fc405481147429ddd7432c0d
 
 # use the WORKDIR from the CI image
 # hadolint ignore=DL3045

diff --git a/nix/default.nix b/nix/default.nix
@@ -39,10 +39,10 @@ in buildEnv {
 
     (import (builtins.fetchGit {
       # Descriptive name to make the store path easier to identify
-      name = "go-1.17.1";
+      name = "go-1.17.2";
       url = "https://github.com/NixOS/nixpkgs/";
       ref = "refs/heads/nixpkgs-unstable";
-      rev = "6d488e823899d2dc1c2ce746a900b3267e93c2f7";
+      rev = "db3aa421df73f43c03ad266619e22ce7c5354d92";
     }) {}).go_1_17
 
     (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-4b09540d82b4496c79089a3228ced3142ed83c40
+  image=milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d
   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-4b09540d82b4496c79089a3228ced3142ed83c40
+  image=milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d
   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-4b09540d82b4496c79089a3228ced3142ed83c40
+  image=milmove/circleci-docker:milmove-app-96cac8d8f0103661fc405481147429ddd7432c0d
   docker pull -q "${image}"
   docker run --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" swagger validate "${filename}"
 fi
diff --git a/scripts/prereqs b/scripts/prereqs
@@ -5,7 +5,7 @@ set -eu -o pipefail
 RED='\033[0;31m'
 YELLOW='\033[0;33m'
 NC='\033[0m' # No Color
-GOVERSION='1.17.1'
+GOVERSION='1.17.2'
 
 prereqs_found=true