From cd5919499872ecb541bdccf94aa196cfa73b205e Mon Sep 17 00:00:00 2001 From: Roman Tkachenko Date: Thu, 14 Apr 2022 16:36:04 -0700 Subject: [PATCH] Bump Go to 1.17.9 (#11932) --- .drone.yml | 36 ++++++++++++++++++------------------ build.assets/Makefile | 2 +- docker/Dockerfile | 2 +- e | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index bc0b2964eb8d1..e718dfc36fdec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ name: push-build-linux-amd64 environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -143,7 +143,7 @@ name: push-build-linux-386 environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -246,7 +246,7 @@ name: push-build-linux-amd64-fips environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -353,7 +353,7 @@ name: push-build-windows-amd64 environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -513,7 +513,7 @@ steps: - tar -C ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz - rm -rf $RUNTIME.darwin-amd64.tar.gz environment: - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 - name: Install Rust Toolchain commands: - set -u @@ -598,7 +598,7 @@ name: push-build-linux-arm environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -701,7 +701,7 @@ name: push-build-linux-arm64 environment: BUILDBOX_VERSION: teleport9 GID: "1000" - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 UID: "1000" trigger: event: @@ -1061,7 +1061,7 @@ type: kubernetes name: build-linux-amd64-centos7 environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -1218,7 +1218,7 @@ type: kubernetes name: build-linux-amd64-centos7-fips environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -1374,7 +1374,7 @@ type: kubernetes name: build-linux-amd64 environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -1528,7 +1528,7 @@ type: kubernetes name: build-linux-amd64-fips environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -2372,7 +2372,7 @@ type: kubernetes name: build-linux-386 environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -2932,7 +2932,7 @@ steps: - tar -C ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz - rm -rf $RUNTIME.darwin-amd64.tar.gz environment: - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 - name: Install Rust Toolchain commands: - set -u @@ -3430,7 +3430,7 @@ type: kubernetes name: build-linux-arm environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -3584,7 +3584,7 @@ type: kubernetes name: build-linux-arm64 environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -4434,7 +4434,7 @@ type: kubernetes name: build-windows-amd64 environment: BUILDBOX_VERSION: teleport9 - RUNTIME: go1.17.7 + RUNTIME: go1.17.9 trigger: event: include: @@ -4585,7 +4585,7 @@ type: kubernetes name: build-docker-images environment: - RUNTIME: go1.17.2 + RUNTIME: go1.17.9 trigger: event: @@ -5388,6 +5388,6 @@ volumes: name: drone-s3-debrepo-pvc --- kind: signature -hmac: a17c7787bc30da9f10246f22b11c1a35796bc18ae8996a042efda3bfad6348fa +hmac: 66d0b44f8a3e7ace429c58b1ef1079f988264cf7e263a37d6502d2e7cc34283a ... diff --git a/build.assets/Makefile b/build.assets/Makefile index 8af7833aa86d4..41633b657ec6c 100644 --- a/build.assets/Makefile +++ b/build.assets/Makefile @@ -17,7 +17,7 @@ TEST_KUBE ?= OS ?= linux ARCH ?= amd64 BUILDBOX_VERSION=teleport9 -GOLANG_VERSION ?= go1.17.7 +GOLANG_VERSION ?= go1.17.9 RUST_VERSION ?= 1.58.1 BORINGCRYPTO_RUNTIME=$(GOLANG_VERSION)b7 LIBBPF_VERSION ?= 0.3.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index b85f581836d94..4c12385354cc3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # The base image (buildbox:latest) is built by running `make -C build.assets` # from the base repo directory $GOPATH/gravitational.com/teleport -FROM quay.io/gravitational/teleport-buildbox:go1.17.2 +FROM quay.io/gravitational/teleport-buildbox:teleport9 # DEBUG=1 is needed for the Web UI to be loaded from static assets instead # of the binary diff --git a/e b/e index 6b343d4d8a3ed..f6d4d4532b373 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 6b343d4d8a3ed9a10734e7576189941211a9b644 +Subproject commit f6d4d4532b37324ea62d07e3d01836696b155299