From 5508e5ed91c8fed23502c671bed1e3e89cedc239 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Sun, 28 Apr 2024 23:45:25 +0000 Subject: [PATCH] Dockerfile: update golang to 1.22.2 Signed-off-by: Derek Su --- Dockerfile.dapper | 2 +- package/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 719487682..8cffc4b9b 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -37,7 +37,7 @@ RUN if [ ${ARCH} == "s390x" ]; then \ # Install Go & tools ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN wget -O - https://storage.googleapis.com/golang/go1.21.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local +RUN wget -O - https://storage.googleapis.com/golang/go1.22.2.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 # Install libqcow to resolve error: diff --git a/package/Dockerfile b/package/Dockerfile index 2cd418043..c34209098 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -14,7 +14,7 @@ RUN zypper -n install cmake curl wget git gcc tar gzip xsltproc docbook-xsl-styl # Build go-spdk-helper ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH_s390x=s390x GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN wget -O - https://storage.googleapis.com/golang/go1.21.3.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \ +RUN wget -O - https://storage.googleapis.com/golang/go1.22.2.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \ go install golang.org/x/lint/golint@latest ENV GO_SPDK_HELPER_DIR /usr/src/go-spdk-helper