[arvados] created: 2.7.0-5803-g623b01534a
git repository hosting
git at public.arvados.org
Tue Jan 9 20:40:13 UTC 2024
at 623b01534a135a964cc473b45cf8333a780a1b74 (commit)
commit 623b01534a135a964cc473b45cf8333a780a1b74
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 9 15:38:33 2024 -0500
21367: Add arvados virtualenv to $PATH
This is both more user-friendly (now a-c-r itself is in $PATH) and a
cleaner implementation than the previous version.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 563cd41e92..371b9cc984 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -14,13 +14,10 @@ ADD 1078ECD7.key /etc/apt/trusted.gpg.d/arvados.asc
RUN apt-get update -q
RUN DEBIAN_FRONTEND=noninteractive 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 \
--gecos 'Crunch execution user' crunch && \
/usr/bin/install --directory --owner=crunch --group=crunch --mode=0700 /keep /tmp/crunch-src /tmp/crunch-job
USER crunch
+ENV PATH=/usr/share/python3.9/dist/python3-arvados-cwl-runner/bin:/usr/local/bin:/usr/bin:/bin
commit 686cd2dcbc1ec2ef5f9c1e6bd850934e6cc735fd
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 9 15:34:29 2024 -0500
21367: Modernize apt key handling in arvados/jobs Dockerfile
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 6404574117..563cd41e92 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -6,22 +6,13 @@
FROM debian:bullseye-slim
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update -q
-RUN apt-get install -yq --no-install-recommends gnupg
-
ARG 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
+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 python3-arvados-cwl-runner=$cwl_runner_version
+RUN DEBIAN_FRONTEND=noninteractive 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
commit d37f4339273ea693703e8f9de6f54b34573faf62
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 9 15:26:06 2024 -0500
21367: Remove debug prints
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 0dfd9b444e..6404574117 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -12,7 +12,6 @@ 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/
@@ -20,7 +19,6 @@ 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 python3-arvados-cwl-runner=$cwl_runner_version
commit d9e6260518eea8aefa583b2080d74bdb9469566f
Author: Brett Smith <brett.smith at curii.com>
Date: Tue Jan 9 15:24:24 2024 -0500
21367: Update arvados/jobs image to bullseye
Required for Python 3.7 deprecation.
Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 1b75e13420..0dfd9b444e 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
# Based on Debian
-FROM debian:buster-slim
+FROM debian:bullseye-slim
MAINTAINER Arvados Package Maintainers <packaging at arvados.org>
ENV DEBIAN_FRONTEND noninteractive
diff --git a/docker/jobs/apt.arvados.org-dev.list b/docker/jobs/apt.arvados.org-dev.list
index 210f5d5511..155244ba9f 100644
--- a/docker/jobs/apt.arvados.org-dev.list
+++ b/docker/jobs/apt.arvados.org-dev.list
@@ -1,2 +1,2 @@
# apt.arvados.org
-deb http://apt.arvados.org/buster buster-dev main
+deb http://apt.arvados.org/bullseye bullseye-dev main
diff --git a/docker/jobs/apt.arvados.org-stable.list b/docker/jobs/apt.arvados.org-stable.list
index 153e729805..5a4b8c91c8 100644
--- a/docker/jobs/apt.arvados.org-stable.list
+++ b/docker/jobs/apt.arvados.org-stable.list
@@ -1,2 +1,2 @@
# apt.arvados.org
-deb http://apt.arvados.org/buster buster main
+deb http://apt.arvados.org/bullseye bullseye main
diff --git a/docker/jobs/apt.arvados.org-testing.list b/docker/jobs/apt.arvados.org-testing.list
index d5f4581685..302862ca64 100644
--- a/docker/jobs/apt.arvados.org-testing.list
+++ b/docker/jobs/apt.arvados.org-testing.list
@@ -1,2 +1,2 @@
# apt.arvados.org
-deb http://apt.arvados.org/buster buster-testing main
+deb http://apt.arvados.org/bullseye bullseye-testing main
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list