From 792ea778dcca0bcedfab0386bf5cbbdd8e18b660 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Fri, 15 Jan 2021 12:39:33 -0500 Subject: [PATCH] Use 1.15.4 in CI and Dockerfile. (#10587) --- .circleci/config.yml | 20 ++++++++++---------- .circleci/config/commands/go_test.yml | 2 +- .circleci/config/executors/@executors.yml | 8 ++++---- scripts/docker/Dockerfile | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b570b8392..ddb689d76 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -685,7 +685,7 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.15.3 + - GO_VERSION: 1.15.4 - GO111MODULE: 'off' - GOTESTSUM_VERSION: 0.5.2 algolia-index: @@ -783,7 +783,7 @@ jobs: - .buildcache/packages/store test-go-remote-docker: docker: - - image: docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster + - image: docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster resource_class: medium working_directory: /go/src/github.com/hashicorp/vault parallelism: 8 @@ -864,7 +864,7 @@ jobs: -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer circleci/golang:1.15.3-buster \ + testcontainer circleci/golang:1.15.4-buster \ tail -f /dev/null # Run tests @@ -992,7 +992,7 @@ jobs: - .buildcache/packages/store test-go-race: docker: - - image: docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster + - image: docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster resource_class: xlarge working_directory: /go/src/github.com/hashicorp/vault parallelism: 8 @@ -1069,7 +1069,7 @@ jobs: -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer circleci/golang:1.15.3-buster \ + testcontainer circleci/golang:1.15.4-buster \ tail -f /dev/null # Run tests @@ -1449,7 +1449,7 @@ jobs: - .buildcache/packages/store test-go: docker: - - image: docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster + - image: docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster resource_class: large working_directory: /go/src/github.com/hashicorp/vault parallelism: 8 @@ -1526,7 +1526,7 @@ jobs: -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer circleci/golang:1.15.3-buster \ + testcontainer circleci/golang:1.15.4-buster \ tail -f /dev/null # Run tests @@ -2021,12 +2021,12 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.15.3 + - GO_VERSION: 1.15.4 - GO111MODULE: 'off' - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: docker: - - image: docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster + - image: docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster resource_class: medium working_directory: /go/src/github.com/hashicorp/vault parallelism: 8 @@ -2107,7 +2107,7 @@ jobs: -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \ -e VAULT_TEST_LOG_DIR=/tmp/testlogs \ --network vaulttest --name \ - testcontainer circleci/golang:1.15.3-buster \ + testcontainer circleci/golang:1.15.4-buster \ tail -f /dev/null # Run tests diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml index 94047af0a..731aa141d 100644 --- a/.circleci/config/commands/go_test.yml +++ b/.circleci/config/commands/go_test.yml @@ -8,7 +8,7 @@ parameters: default: "/tmp/testlogs" go_image: type: string - default: "circleci/golang:1.15.3-buster" + default: "circleci/golang:1.15.4-buster" use_docker: type: boolean default: false diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index 20dbc54cf..fadc3a3ee 100644 --- a/.circleci/config/executors/@executors.yml +++ b/.circleci/config/executors/@executors.yml @@ -4,7 +4,7 @@ go-machine: environment: GO111MODULE: "off" CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) - GO_VERSION: 1.15.3 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.15.4 # Pin Go to patch version (ex: 1.2.3) GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3) GO_TAGS: "" working_directory: /go/src/github.com/hashicorp/vault @@ -26,7 +26,7 @@ alpine: docker-env-go-test-remote-docker: resource_class: medium docker: - - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster" + - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster" environment: GO111MODULE: "off" CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) @@ -35,7 +35,7 @@ docker-env-go-test-remote-docker: docker-env-go-test: resource_class: large docker: - - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster" + - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster" environment: GO111MODULE: "off" CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) @@ -44,7 +44,7 @@ docker-env-go-test: docker-env-go-test-race: resource_class: xlarge docker: - - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.3-buster" + - image: "docker.mirror.hashicorp.services/circleci/golang:1.15.4-buster" environment: GO111MODULE: "off" CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 396e50414..6ffba1595 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,7 +1,7 @@ # Multi-stage builder to avoid polluting users environment with wrong # architecture binaries. Since this binary is used in an alpine container, # we're explicitly compiling for 'linux/amd64' -ARG VERSION=1.15.3 +ARG VERSION=1.15.4 FROM golang:${VERSION} AS builder