X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..fd04088f4cd977b911818789781c13a61ff00ecc:/docker/jobs/Dockerfile diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile index 12c68564bd..1b75e13420 100644 --- a/docker/jobs/Dockerfile +++ b/docker/jobs/Dockerfile @@ -2,26 +2,32 @@ # # SPDX-License-Identifier: Apache-2.0 -# Based on Debian Jessie -FROM debian:jessie -MAINTAINER Ward Vandewege +# Based on Debian +FROM debian:buster-slim +MAINTAINER Arvados Package Maintainers ENV DEBIAN_FRONTEND noninteractive -ADD apt.arvados.org.list /etc/apt/sources.list.d/ -RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7 -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 +RUN apt-get update -q +RUN apt-get install -yq --no-install-recommends gnupg + +ARG repo_version +RUN echo repo_version $repo_version +ADD apt.arvados.org-$repo_version.list /etc/apt/sources.list.d/ + +ADD 1078ECD7.key /tmp/ +RUN cat /tmp/1078ECD7.key | apt-key add - ARG python_sdk_version ARG cwl_runner_version RUN echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version RUN apt-get update -q -RUN apt-get install -yq --no-install-recommends \ - git python-pip python-virtualenv \ - python-dev libgnutls28-dev libcurl4-gnutls-dev nodejs \ - python-arvados-python-client=$python_sdk_version \ - python-arvados-cwl-runner=$cwl_runner_version +RUN apt-get install -yq --no-install-recommends python3-arvados-cwl-runner=$cwl_runner_version + +# use the Python executable from the python-arvados-cwl-runner package +RUN PYTHON=`ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python|head -n1` && rm -f /usr/bin/python && ln -s $PYTHON /usr/bin/python +RUN PYTHON3=`ls /usr/share/python3*/dist/python3-arvados-cwl-runner/bin/python3|head -n1` && rm -f /usr/bin/python3 && ln -s $PYTHON3 /usr/bin/python3 # Install dependencies and set up system. RUN /usr/sbin/adduser --disabled-password \