Skip to content

Commit

Permalink
Upgrade go to 1.17.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan-Koch committed Dec 13, 2021
1 parent 0b3870d commit 689e506
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version: '2.1'

# References for variables shared across the file
references:
circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
circleci-docker: &circleci-docker milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf

# the cypress image to use
cypress: &cypress milmove/circleci-docker:milmove-cypress-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.2
1.17.5
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
golang 1.17.2
golang 1.17.5
2 changes: 1 addition & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.migrations_local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tasks_local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tools_local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

ENV CIRCLECI=true

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webhook_client
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

# Prepare public DOD certificates.
# hadolint ignore=DL3002
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.webhook_client_local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# BUILDER #
###########

FROM milmove/circleci-docker:milmove-app-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 as builder
FROM milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf as builder

# Prepare public DOD certificates.
# hadolint ignore=DL3002
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,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-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
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-86f3163991b707d1351cc01d2c9cdc2dbaae4e93 bash

.PHONY: prune_images
Expand Down
2 changes: 1 addition & 1 deletion cypress/Dockerfile.cypress
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM milmove/circleci-docker:milmove-cypress-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
FROM milmove/circleci-docker:milmove-cypress-cf2249e54c69b52625f1ab04eb79f37381d0d3bf

# use the WORKDIR from the CI image
# hadolint ignore=DL3045
Expand Down
4 changes: 2 additions & 2 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ in buildEnv {

(import (builtins.fetchGit {
# Descriptive name to make the store path easier to identify
name = "go-1.17.2";
name = "go-1.17.5";
url = "https://github.com/NixOS/nixpkgs/";
ref = "refs/heads/nixpkgs-unstable";
rev = "6f0b0bb7028cf612298673bf6b5d453bcc7af965";
rev = "0acfd0c1e179c1fa276fd931bdd22f207e7d5a48";
}) {}).go_1_17

(import (builtins.fetchGit {
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen-assets
Original file line number Diff line number Diff line change
Expand Up @@ -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-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
image=milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
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
2 changes: 1 addition & 1 deletion scripts/gen-server
Original file line number Diff line number Diff line change
Expand Up @@ -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-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
image=milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
docker pull -q "${image}"
fi

Expand Down
2 changes: 1 addition & 1 deletion scripts/pre-commit-swagger-validate
Original file line number Diff line number Diff line change
Expand Up @@ -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-86f3163991b707d1351cc01d2c9cdc2dbaae4e93
image=milmove/circleci-docker:milmove-app-cf2249e54c69b52625f1ab04eb79f37381d0d3bf
docker pull -q "${image}"
docker run --rm=true -v "${PWD}:${PWD}" -w "${PWD}" "${image}" swagger validate "${filename}"
fi

0 comments on commit 689e506

Please sign in to comment.