The Arvados apt repositories have been reorganized.

refs #17218

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime
index 2623afc7724962a5b7ab10503f7610faae81bee3..318445573d3fedffda2ffa90d347417d6b2a0841 100644 (file)
--- 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 a415d159529343e0c88ae3b7dac8bbaa50362f86..03a8bc19dfa60a84ef7cd0e55180a2da2dbc2f16 100644 (file)
--- 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 1b4cc65ce11b5bf7fada704d967fd0ff53158937..7991793e04dda132171b73fc907d5156efe1f51d 100644 (file)
--- 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 -