Commit 54ce6104 authored by Jason Plum's avatar Jason Plum
Browse files

Merge branch 'sh-upgrade-go-1.16.4' into 'master'

Update Go to v1.16.4

See merge request gitlab-org/build/CNG!691
parents a31654f8 dfdb7b42
Pipeline #5569 failed with stages
in 46 seconds
......@@ -9,7 +9,7 @@ variables:
GITALY_SERVER_VERSION: "master"
GITLAB_PAGES_VERSION: "master"
GIT_VERSION: "2.29.0"
GO_VERSION: "1.16.3"
GO_VERSION: "1.16.4"
KUBECTL_VERSION: "1.16.15"
PG_VERSION: "13.2"
MAILROOM_VERSION: "0.0.12"
......
......@@ -4,7 +4,7 @@ ARG FROM_IMAGE="$CI_REGISTRY_IMAGE/gitlab-ruby"
FROM ${FROM_IMAGE}:${TAG}
ARG GO_VERSION=1.16.3
ARG GO_VERSION=1.16.4
ARG BUILD_DIR=/tmp/build
ENV GO_URL="https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz"
......
......@@ -2,7 +2,7 @@ ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.4
FROM ${UBI_IMAGE}
ARG GO_VERSION=1.16.3
ARG GO_VERSION=1.16.4
RUN mkdir -p /assets/usr/local \
&& curl --retry 6 https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz -o go${GO_VERSION}.linux-amd64.tar.gz \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment