X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/28f892a37c81486a3fc353fdb6c875e708e0f7c9..c3cea0c565585e089f571545fcbf28ee4e703671:/build/package-build-dockerfiles/debian11/Dockerfile diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile index cfeaf2463a..8951f07803 100644 --- a/build/package-build-dockerfiles/debian11/Dockerfile +++ b/build/package-build-dockerfiles/debian11/Dockerfile @@ -4,11 +4,13 @@ ARG HOSTTYPE ARG BRANCH +ARG GOVERSION ## dont use debian:11 here since the word 'bullseye' is used for rvm precompiled binaries FROM debian:bullseye 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/ @@ -22,13 +24,15 @@ ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediat FROM debian:bullseye 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/ ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ FROM build_${HOSTTYPE} +RUN echo HOSTTYPE ${HOSTTYPE} MAINTAINER Arvados Package Maintainers