From 2f21253367ef9176ac1ca68ccdb968bc56687602 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 23 Dec 2020 09:00:07 -0500 Subject: [PATCH] The Arvados apt repositories have been reorganized. refs #17218 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- dockerfiles/Dockerfile.rails-runtime | 2 +- dockerfiles/Dockerfile.runtime | 4 ++-- dockerfiles/Dockerfile.shell_server-runtime | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime index 2623afc..3184455 100644 --- a/dockerfiles/Dockerfile.rails-runtime +++ b/dockerfiles/Dockerfile.rails-runtime @@ -13,7 +13,7 @@ RUN sed -i 's/daemon off;/#daemon off;/' /etc/nginx/nginx.conf ADD 1078ECD7.asc /tmp/ RUN cat /tmp/1078ECD7.asc | apt-key add - -RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list +RUN echo "deb http://apt.arvados.org/bionic bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list RUN apt-get update && apt-get install -qqy tzdata diff --git a/dockerfiles/Dockerfile.runtime b/dockerfiles/Dockerfile.runtime index a415d15..03a8bc1 100644 --- a/dockerfiles/Dockerfile.runtime +++ b/dockerfiles/Dockerfile.runtime @@ -6,8 +6,8 @@ FROM ubuntu:18.04 RUN apt-get update && apt-get install -y gnupg2 ca-certificates -RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list -RUN echo "deb http://apt.arvados.org/ bionic-dev main" >> /etc/apt/sources.list.d/apt.arvados.org.list +RUN echo "deb http://apt.arvados.org/bionic bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list +RUN echo "deb http://apt.arvados.org/bionic bionic-dev main" >> /etc/apt/sources.list.d/apt.arvados.org.list ADD 1078ECD7.asc /tmp/ RUN cat /tmp/1078ECD7.asc | apt-key add - diff --git a/dockerfiles/Dockerfile.shell_server-runtime b/dockerfiles/Dockerfile.shell_server-runtime index 1b4cc65..7991793 100644 --- a/dockerfiles/Dockerfile.shell_server-runtime +++ b/dockerfiles/Dockerfile.shell_server-runtime @@ -6,7 +6,7 @@ FROM phusion/baseimage:master RUN apt-get update && apt-get install -y gnupg2 -RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list +RUN echo "deb http://apt.arvados.org/bionic bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list ADD 1078ECD7.asc /tmp/ RUN cat /tmp/1078ECD7.asc | apt-key add - -- 2.30.2