Update go to version 1.18.1

transcom · Apr 15, 2022 · 2c8a59c · 2c8a59c
1 parent 8c11fd6
commit 2c8a59c
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/Dockerfile.local b/Dockerfile.local
@@ -2,7 +2,7 @@
 # BUILDER #
 ###########
 
-FROM milmove/circleci-docker:milmove-app-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633 as builder
+FROM milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576 as builder
 
 # Prepare public DOD certificates.
 # hadolint ignore=DL3002

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

diff --git a/README.md b/README.md
@@ -948,7 +948,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.18/bin/go`
+    something like `/nix/store/rv16prybnsmav8w1sqdgr80jcwsja98q-go-1.18.1/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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633
+FROM milmove/circleci-docker:milmove-cypress-f678d1c6a5e2085f733f5408b7affd628f9f3576
 
 # use the WORKDIR from the CI image
 # hadolint ignore=DL3045

diff --git a/nix/default.nix b/nix/default.nix
@@ -35,10 +35,10 @@ in buildEnv {
 
     (import (builtins.fetchGit {
       # Descriptive name to make the store path easier to identify
-      name = "go-1.18";
+      name = "go-1.18.1";
       url = "https://github.com/NixOS/nixpkgs/";
       ref = "refs/heads/nixpkgs-unstable";
-      rev = "3b5a3dfd589689bd2c50aa6fcd80903ee1f0c434";
+      rev = "d08394e7cd5c7431a1e8f53b7f581e74ee909548";
     }) {}).go_1_18
 
     (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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633
+  image=milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576
   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
@@ -13,7 +13,7 @@ if [ -n "${LOCAL_SWAGGER+x}" ]; then
   echo "Using local swagger"
 else
   # Locally we need to download the docker image to get the binary
-  image=milmove/circleci-docker:milmove-app-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633
+  image=milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576
   docker pull -q "${image}"
 fi
 

diff --git a/scripts/pre-commit-swagger-validate b/scripts/pre-commit-swagger-validate
@@ -19,7 +19,7 @@ if [[ -n "${LOCAL_SWAGGER+x}" ]]; then
   done
 else
   # Locally we need to download the docker image to get the binary
-  image=milmove/circleci-docker:milmove-app-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633
+  image=milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576
   docker pull -q "${image}"
   for filename in "$@"; do
     docker run --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" swagger validate "${filename}"

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-3d4d7c108724ebcbe7d986d63dcd6fb8a4246633
+circleci_build_image=milmove/circleci-docker:milmove-app-f678d1c6a5e2085f733f5408b7affd628f9f3576
 
 set -eux -o pipefail