From fae9f8b5646fa346dbcb7470378967cb0c91f89e Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Thu, 30 Jul 2020 10:18:48 -0700 Subject: [PATCH] :seedling: Update to Go 1.13.14 Signed-off-by: Vince Prignano --- Dockerfile | 2 +- Makefile | 4 ++-- Tiltfile | 2 +- cmd/example-provider/Dockerfile | 2 +- test/infrastructure/docker/Dockerfile | 2 +- test/infrastructure/docker/Dockerfile.dev | 2 +- test/infrastructure/docker/Makefile | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ddd6120ecf1..327841bb7f57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.13.12 as builder +FROM golang:1.13.14 as builder WORKDIR /workspace # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy diff --git a/Makefile b/Makefile index fdffaa135290..179774b137d9 100644 --- a/Makefile +++ b/Makefile @@ -477,14 +477,14 @@ release-binary: $(RELEASE_DIR) -e GOARCH=$(GOARCH) \ -v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \ -w /workspace \ - golang:1.13.12 \ + golang:1.13.14 \ go build -a -ldflags "$(LDFLAGS) -extldflags '-static'" \ -o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY) .PHONY: release-staging release-staging: ## Builds and push container images to the staging bucket. docker pull docker.io/docker/dockerfile:experimental - docker pull docker.io/library/golang:1.13.12 + docker pull docker.io/library/golang:1.13.14 docker pull gcr.io/distroless/static:latest REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag diff --git a/Tiltfile b/Tiltfile index edcd38108a91..78fa9329b50f 100644 --- a/Tiltfile +++ b/Tiltfile @@ -120,7 +120,7 @@ def load_provider_tiltfiles(): tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.13.12 as tilt-helper +FROM golang:1.13.14 as tilt-helper # Support live reloading with Tilt RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \ wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \ diff --git a/cmd/example-provider/Dockerfile b/cmd/example-provider/Dockerfile index d3ecc0d709a0..2d2439efb20a 100644 --- a/cmd/example-provider/Dockerfile +++ b/cmd/example-provider/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.13.12 as builder +FROM golang:1.13.14 as builder # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy ARG goproxy=https://proxy.golang.org diff --git a/test/infrastructure/docker/Dockerfile b/test/infrastructure/docker/Dockerfile index 7a9b3dfb10c5..81c8d3e871ce 100644 --- a/test/infrastructure/docker/Dockerfile +++ b/test/infrastructure/docker/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.13.12 as builder +FROM golang:1.13.14 as builder # Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy ARG goproxy=https://proxy.golang.org diff --git a/test/infrastructure/docker/Dockerfile.dev b/test/infrastructure/docker/Dockerfile.dev index 929c47d4fc4d..0e3eb7249903 100644 --- a/test/infrastructure/docker/Dockerfile.dev +++ b/test/infrastructure/docker/Dockerfile.dev @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.13.12 +FROM golang:1.13.14 # ALERT ################################################################ # This is an unusual dockerfile. The expected build context is all of # diff --git a/test/infrastructure/docker/Makefile b/test/infrastructure/docker/Makefile index 378ca7c20021..f4977a90af3e 100644 --- a/test/infrastructure/docker/Makefile +++ b/test/infrastructure/docker/Makefile @@ -213,7 +213,7 @@ release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a rele .PHONY: release-staging release-staging: ## Builds and push container images to the staging bucket. docker pull docker.io/docker/dockerfile:experimental - docker pull docker.io/library/golang:1.13.12 + docker pull docker.io/library/golang:1.13.14 docker pull gcr.io/distroless/static:latest REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag