X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4c86081e1ee5149f09f05cd3b77e59fc652d4ab3..9e278e167bcede690e699436d5653b5c1b41cfc5:/docker/jobs/Dockerfile diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile index 9b1be1e74d..05d8547c52 100644 --- a/docker/jobs/Dockerfile +++ b/docker/jobs/Dockerfile @@ -1,23 +1,18 @@ -# Based on Debian Jessie -FROM debian:jessie -MAINTAINER Ward Vandewege +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 -ENV DEBIAN_FRONTEND noninteractive +# Based on Debian +FROM debian:bullseye-slim +MAINTAINER Arvados Package Maintainers -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 - -ARG python_sdk_version +ARG repo_version ARG cwl_runner_version -RUN echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version +ADD apt.arvados.org-$repo_version.list /etc/apt/sources.list.d/ +ADD 1078ECD7.key /etc/apt/trusted.gpg.d/arvados.asc 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 DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends python3-arvados-cwl-runner=$cwl_runner_version # Install dependencies and set up system. RUN /usr/sbin/adduser --disabled-password \ @@ -25,3 +20,4 @@ RUN /usr/sbin/adduser --disabled-password \ /usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job USER crunch +ENV PATH=/usr/lib/python3-arvados-cwl-runner/bin:/usr/local/bin:/usr/bin:/bin