NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-go-to-1-20-6' into 'master'

Browse source 
Update Go 1.19 and 1.20

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/704

Merged-by: DJ Mountney <dj@gitlab.com>
Approved-by: DJ Mountney <dj@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
This commit is contained in:
DJ Mountney 2023-08-23 10:18:05 +00:00
commit a81dce4f92
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/install-golang
View file

@ -29,12 +29,9 @@ function build_ubi() {
cd /usr/local/go/src
PATH=$PATH:/tmp/golang/go/bin CGO_ENABLED=1 ./make.bash
else
# This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved.
if [[ $GO_MAJOR_VERSION == "1.20" ]]; then
GO_BRANCH="go1.20.5-2-openssl-fips"
# This is a workaround until https://github.com/golang-fips/go/pull/107 is released.
elif [[ $GO_MAJOR_VERSION == "1.21" ]]; then
GO_BRANCH="go1.20.6-1-openssl-fips"
if [[ $GO_MAJOR_VERSION == "1.21" ]]; then
GO_BRANCH="go1.20-fips-release"
else
GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
fi

12
scripts/lib/custom-docker-build
View file

@ -45,14 +45,14 @@ function print_golang_args() {
GOLANG_DOWNLOAD_SHA256[arm64]="160497c583d4c7cbc1661230e68b758d01f741cf4bece67e48edc4fdd40ed92d"
;;
1.19)
INSTALL_GOLANG_VERSION=1.19.9
GOLANG_DOWNLOAD_SHA256[amd64]="e858173b489ec1ddbe2374894f52f53e748feed09dde61be5b4b4ba2d73ef34b"
GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1"
INSTALL_GOLANG_VERSION=1.19.12
GOLANG_DOWNLOAD_SHA256[amd64]="48e4fcfb6abfdaa01aaf1429e43bdd49cea5e4687bd5f5b96df1e193fcfd3e7e"
GOLANG_DOWNLOAD_SHA256[arm64]="18da7cf1ae5341e6ee120948221aff96df9145ce70f429276514ca7c67c929b1"
;;
1.20)
INSTALL_GOLANG_VERSION=1.20.5 # Update scripts/install-golang for FIPS if this version is bumped
GOLANG_DOWNLOAD_SHA256[amd64]="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612"
GOLANG_DOWNLOAD_SHA256[arm64]="aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09"
INSTALL_GOLANG_VERSION=1.20.7 # Update scripts/install-golang for FIPS if this version is bumped
GOLANG_DOWNLOAD_SHA256[amd64]="f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44"
GOLANG_DOWNLOAD_SHA256[arm64]="44781ae3b153c3b07651d93b6bc554e835a36e2d72a696281c1e4dad9efffe43"
;;
1.21)
INSTALL_GOLANG_VERSION=1.21.0 # Update scripts/install-golang for FIPS if this version is bumped