Bump Arvados to 2.2.0. Bump the rails-runtime image to Ubuntu 20.04

[arvados-k8s.git] / dockerfiles / Dockerfile.rails-runtime

diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime
index a7b1ea9a8d6f3c8aba4cc4f31274a08edcea4199..3d6baea48552206cec3ae6af706680d80a112871 100644 (file)
--- a/dockerfiles/Dockerfile.rails-runtime
+++ b/dockerfiles/Dockerfile.rails-runtime
@@ -13,15 +13,15 @@ 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/focal focal main" > /etc/apt/sources.list.d/apt.arvados.org.list
 
 RUN apt-get update && apt-get install -qqy tzdata
 
 # preinstall latest arvados rails packages, so that we have (most of) the gems
 # baked into this docker image. Then remove them so that this image is generic.
 # The bundles will remain installed.
-RUN apt-get install -qqy arvados-workbench arvados-sso-server arvados-api-server
-RUN apt-get remove -qqy arvados-workbench arvados-sso-server arvados-api-server
+RUN apt-get install -qqy arvados-workbench arvados-api-server
+RUN apt-get remove -qqy arvados-workbench arvados-api-server arvados-server
 
 # put nginx.conf back into the state it needs to be
 RUN sed -i 's/#daemon off;/daemon off;/' /etc/nginx/nginx.conf