From b114a8fdad01412447bef82c83a43cfc71628acc Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 9 Dec 2021 11:09:03 +0530 Subject: [PATCH] ci: install go version specified in build.env installed the go version specified in build.env in the test docker image. Signed-off-by: Madhu Rajanna --- scripts/Dockerfile.test | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile.test b/scripts/Dockerfile.test index 951d4b3fa..cd8064cc2 100644 --- a/scripts/Dockerfile.test +++ b/scripts/Dockerfile.test @@ -11,11 +11,13 @@ FROM registry.fedoraproject.org/fedora:latest ARG GOPATH=/go +ARG GOROOT=/usr/local/go ENV \ GOPATH=${GOPATH} \ + GOROOT=${GOROOT} \ GO111MODULE=on \ - PATH="${GOPATH}/bin:/opt/commitlint/node_modules/.bin:${PATH}" + PATH="${GOROOT}/bin:${GOPATH}/bin:/opt/commitlint/node_modules/.bin:${PATH}" COPY build.env / @@ -23,7 +25,6 @@ RUN source /build.env \ && dnf -y install \ git \ make \ - golang \ gcc \ librados-devel \ librbd-devel \ @@ -38,6 +39,9 @@ RUN source /build.env \ && dnf -y update \ && dnf -y clean all \ && gem install mdl \ + && mkdir -p ${GOROOT} \ + && curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \ + | tar xzf - -C ${GOROOT} --strip-components=1 \ && curl -sf "https://install.goreleaser.com/github.com/golangci/golangci-lint.sh" \ | bash -s -- -b ${GOPATH}/bin "${GOLANGCI_VERSION}" \ && curl -L https://git.io/get_helm.sh | bash -s -- --version "${HELM_VERSION}" \