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 'golang-1.19.9-1.20.4-patch' into 'master'

Browse source 
Use the newest golang patch 1.19.9 and 1.20.4

Closes #128

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: DJ Mountney <dj@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2023-06-01 07:43:13 +00:00
commit f1d7f29deb
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install-golang
View file

@ -31,7 +31,7 @@ function build_ubi() {
else else
# This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved. # This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved.
if [[ $GO_MAJOR_VERSION == "1.20" ]]; then if [[ $GO_MAJOR_VERSION == "1.20" ]]; then
GO_BRANCH="go1.20.3-openssl-fips" GO_BRANCH="go1.20.4-3-openssl-fips"
else else
GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release" GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release"
fi fi

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

@ -45,14 +45,14 @@ function print_golang_args() {
GOLANG_DOWNLOAD_SHA256[arm64]="160497c583d4c7cbc1661230e68b758d01f741cf4bece67e48edc4fdd40ed92d" GOLANG_DOWNLOAD_SHA256[arm64]="160497c583d4c7cbc1661230e68b758d01f741cf4bece67e48edc4fdd40ed92d"
;; ;;
1.19) 1.19)
INSTALL_GOLANG_VERSION=1.19.8 INSTALL_GOLANG_VERSION=1.19.9
GOLANG_DOWNLOAD_SHA256[amd64]="e1a0bf0ab18c8218805a1003fd702a41e2e807710b770e787e5979d1cf947aba" GOLANG_DOWNLOAD_SHA256[amd64]="e858173b489ec1ddbe2374894f52f53e748feed09dde61be5b4b4ba2d73ef34b"
GOLANG_DOWNLOAD_SHA256[arm64]="f89e7c0ba63782143bd1f896e4b96ea09e4baf39e8bc2f2ddf27339f9e433dd3" GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1"
;; ;;
1.20) 1.20)
INSTALL_GOLANG_VERSION=1.20.3 # Update scripts/install-golang for FIPS if this version is bumped INSTALL_GOLANG_VERSION=1.20.4 # Update scripts/install-golang for FIPS if this version is bumped
GOLANG_DOWNLOAD_SHA256[amd64]="979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca" GOLANG_DOWNLOAD_SHA256[amd64]="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd"
GOLANG_DOWNLOAD_SHA256[arm64]="eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54" GOLANG_DOWNLOAD_SHA256[arm64]="105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6"
;; ;;
*) fail "Unknown golang version $1" ;; *) fail "Unknown golang version $1" ;;
esac esac