X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9a11b502e406202db58fb6751f3448aa30288062..09cbdc3074b3f1e69c9c537875146f6da0a6ed8f:/build/package-build-dockerfiles/centos7/Dockerfile diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile index e44d231edf..f0ae5df3f7 100644 --- a/build/package-build-dockerfiles/centos7/Dockerfile +++ b/build/package-build-dockerfiles/centos7/Dockerfile @@ -4,10 +4,12 @@ ARG HOSTTYPE ARG BRANCH +ARG GOVERSION FROM centos:7 as build_x86_64 # Install go -ONBUILD ADD generated/go1.17.1.linux-amd64.tar.gz /usr/local/ +ONBUILD ARG GOVERSION +ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ @@ -15,7 +17,8 @@ ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ FROM centos:7 as build_aarch64 # Install go -ONBUILD ADD generated/go1.17.1.linux-arm64.tar.gz /usr/local/ +ONBUILD ARG GOVERSION +ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ # Install nodejs and npm ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ @@ -29,7 +32,7 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-c"] # Install dependencies. -RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel fuse-devel xz-libs git wget pam-devel +RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel fuse-devel xz-libs git wget pam-devel # Install RVM ADD generated/mpapis.asc /tmp/