From 686cd2dcbc1ec2ef5f9c1e6bd850934e6cc735fd Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Tue, 9 Jan 2024 15:34:29 -0500 Subject: [PATCH] 21367: Modernize apt key handling in arvados/jobs Dockerfile Arvados-DCO-1.1-Signed-off-by: Brett Smith --- docker/jobs/Dockerfile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) 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 -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 -- 2.30.2