From 11811e907d69dfc55e6f0e14181a4eff251e41b3 Mon Sep 17 00:00:00 2001 From: Mehul Jindal <88073743+mehul-jindal@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:53:44 +0530 Subject: [PATCH] fix(feg): replace golang package repository (#15350) * fix(feg): replace golang package repository Signed-off-by: mehul-jindal * fix(workflows): Allow GO v1.21.0 through Golang version check for Dockerfiles Signed-off-by: mehul-jindal --------- Signed-off-by: mehul-jindal --- .github/workflows/scripts/golang_check_version.sh | 2 +- feg/gateway/docker/go/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/golang_check_version.sh b/.github/workflows/scripts/golang_check_version.sh index 5a3bf85f96c5..3640c6fb9026 100755 --- a/.github/workflows/scripts/golang_check_version.sh +++ b/.github/workflows/scripts/golang_check_version.sh @@ -43,7 +43,7 @@ do while read -r line; do version=$(echo "$line" | awk -F '"' '{print $2}') - if [[ -n $version && $version != "$expected_version" ]] + if [[ -n $version && $version != "$expected_version" && $version != "1.21.0" ]] then echo "Found unexpected Go version $version in file $(realpath --relative-to="$MAGMA_ROOT" "$file"):" echo "$line" diff --git a/feg/gateway/docker/go/Dockerfile b/feg/gateway/docker/go/Dockerfile index 7802034253ce..62447895107f 100755 --- a/feg/gateway/docker/go/Dockerfile +++ b/feg/gateway/docker/go/Dockerfile @@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y \ # Golang WORKDIR /usr/local -ARG GOLANG_VERSION="1.20.1" +ARG GOLANG_VERSION="1.21.0" RUN GO_TARBALL="go${GOLANG_VERSION}.linux-amd64.tar.gz" \ - && curl https://linuxfoundation.jfrog.io/artifactory/magma-blob/${GO_TARBALL} --remote-name --location \ + && curl https://golang.org/dl/${GO_TARBALL} --remote-name --location \ && tar -xzf ${GO_TARBALL} \ && ln -s /usr/local/go/bin/go /usr/local/bin/go \ && ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt \