From c93c453d853442f253b350259817e545a51efdf5 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Mon, 29 May 2023 13:14:10 -0700 Subject: [PATCH] Use the newest golang patch 1.19.9 and 1.20.4 --- scripts/install-golang | 2 +- scripts/lib/custom-docker-build | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install-golang b/scripts/install-golang index 5ab8025..afa8cf9 100755 --- a/scripts/install-golang +++ b/scripts/install-golang @@ -31,7 +31,7 @@ function build_ubi() { 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.3-openssl-fips" + GO_BRANCH="go1.20.4-3-openssl-fips" else GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release" fi diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 5fad28f..dfedf8b 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -45,14 +45,14 @@ function print_golang_args() { GOLANG_DOWNLOAD_SHA256[arm64]="160497c583d4c7cbc1661230e68b758d01f741cf4bece67e48edc4fdd40ed92d" ;; 1.19) - INSTALL_GOLANG_VERSION=1.19.8 - GOLANG_DOWNLOAD_SHA256[amd64]="e1a0bf0ab18c8218805a1003fd702a41e2e807710b770e787e5979d1cf947aba" - GOLANG_DOWNLOAD_SHA256[arm64]="f89e7c0ba63782143bd1f896e4b96ea09e4baf39e8bc2f2ddf27339f9e433dd3" + INSTALL_GOLANG_VERSION=1.19.9 + GOLANG_DOWNLOAD_SHA256[amd64]="e858173b489ec1ddbe2374894f52f53e748feed09dde61be5b4b4ba2d73ef34b" + GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1" ;; 1.20) - INSTALL_GOLANG_VERSION=1.20.3 # Update scripts/install-golang for FIPS if this version is bumped - GOLANG_DOWNLOAD_SHA256[amd64]="979694c2c25c735755bf26f4f45e19e64e4811d661dd07b8c010f7a8e18adfca" - GOLANG_DOWNLOAD_SHA256[arm64]="eb186529f13f901e7a2c4438a05c2cd90d74706aaa0a888469b2a4a617b6ee54" + INSTALL_GOLANG_VERSION=1.20.4 # Update scripts/install-golang for FIPS if this version is bumped + GOLANG_DOWNLOAD_SHA256[amd64]="698ef3243972a51ddb4028e4a1ac63dc6d60821bf18e59a807e051fee0a385bd" + GOLANG_DOWNLOAD_SHA256[arm64]="105889992ee4b1d40c7c108555222ca70ae43fccb42e20fbf1eebb822f5e72c6" ;; *) fail "Unknown golang version $1" ;; esac