projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21700: Standardize on Bundler~>2.4.0
[arvados.git]
/
docker
/
jobs
/
Dockerfile
diff --git
a/docker/jobs/Dockerfile
b/docker/jobs/Dockerfile
index 12c68564bd5cf2a32beb8668ae95a996e98fd8c9..05d8547c52a5126f36ecc79ae85e3a9f4658ac44 100644
(file)
--- a/
docker/jobs/Dockerfile
+++ b/
docker/jobs/Dockerfile
@@
-2,26
+2,17
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
-# Based on Debian
Jessie
-FROM debian:
jessie
-MAINTAINER
Ward Vandewege <ward@curoverse.com
>
+# Based on Debian
+FROM debian:
bullseye-slim
+MAINTAINER
Arvados Package Maintainers <packaging@arvados.org
>
-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
-
-ARG python_sdk_version
+ARG repo_version
ARG cwl_runner_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 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 \
# Install dependencies and set up system.
RUN /usr/sbin/adduser --disabled-password \
@@
-29,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
/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