diff options
| author | John Lee <64482439+algojohnlee@users.noreply.github.com> | 2022-01-20 19:12:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 19:12:39 -0500 |
| commit | 6f4a2c0c02b45688c19c0e5e3ab9dd48df3d18b9 (patch) | |
| tree | 8020d709773f2b41e9252ab75bf9c6bbca3cccdd | |
| parent | 6fe649657fe4e6474d55b1517413a522e663a2e8 (diff) | |
| parent | 61e3860764970d2cd6bc7f83b3107c8e4b1d9d6e (diff) | |
Merge pull request #3463 from Algo-devops-service/relbeta3.3.0v3.3.0-beta
Specify GOARCH for golang download in Dockerfile
| -rw-r--r-- | docker/build/cicd.ubuntu.Dockerfile | 5 | ||||
| -rw-r--r-- | test/muleCI/mule.yaml | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/build/cicd.ubuntu.Dockerfile b/docker/build/cicd.ubuntu.Dockerfile index 00ec1afc4..aad6c31bf 100644 --- a/docker/build/cicd.ubuntu.Dockerfile +++ b/docker/build/cicd.ubuntu.Dockerfile @@ -3,11 +3,12 @@ ARG ARCH="amd64" FROM ${ARCH}/ubuntu:18.04 ARG GOLANG_VERSION ARG ARCH="amd64" +ARG GOARCH="amd64" ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y build-essential git libboost-all-dev wget sqlite3 autoconf jq bsdmainutils shellcheck awscli WORKDIR /root -RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH%v*}.tar.gz \ - && tar -xvf go${GOLANG_VERSION}.linux-${ARCH%v*}.tar.gz && \ +RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz \ + && tar -xvf go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz && \ mv go /usr/local ENV GOROOT=/usr/local/go \ GOPATH=$HOME/go \ diff --git a/test/muleCI/mule.yaml b/test/muleCI/mule.yaml index ca7bdd244..7d7206760 100644 --- a/test/muleCI/mule.yaml +++ b/test/muleCI/mule.yaml @@ -13,6 +13,7 @@ agents: buildArgs: - GOLANG_VERSION=`./scripts/get_golang_version.sh` - ARCH=amd64 + - GOARCH=amd64 - name: cicd.centos.amd64 dockerFilePath: docker/build/cicd.centos.Dockerfile image: algorand/go-algorand-ci-linux-centos @@ -41,6 +42,7 @@ agents: buildArgs: - GOLANG_VERSION=`./scripts/get_golang_version.sh` - ARCH=arm64v8 + - GOARCH=arm64 - name: cicd.ubuntu.arm dockerFilePath: docker/build/cicd.ubuntu.Dockerfile image: algorand/go-algorand-ci-linux @@ -55,6 +57,7 @@ agents: buildArgs: - GOLANG_VERSION=`./scripts/get_golang_version.sh` - ARCH=arm32v7 + - GOARCH=armv6l - name: docker-ubuntu dockerFilePath: docker/build/docker.ubuntu.Dockerfile image: algorand/go-algorand-docker-linux-ubuntu |