A few fixes:

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

diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime
index 62f02f69b3884fb0868b26d3b62c95929cd72233..90857ec34b06807f682af5112a6c7eb99aacc285 100644 (file)
--- a/dockerfiles/Dockerfile.rails-runtime
+++ b/dockerfiles/Dockerfile.rails-runtime
@@ -4,13 +4,16 @@
 
 FROM phusion/passenger-ruby23
 
+RUN apt-get update && apt-get install -y gnupg2
+
 # put nginx in daemon mode again; the arvados-workbench package restarts
 # nginx, which would lead to a hang otherwise...
 RUN sed -i 's/daemon off;/#daemon off;/' /etc/nginx/nginx.conf
 
-RUN /usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+ADD 1078ECD7.asc /tmp/
+RUN cat /tmp/1078ECD7.asc | apt-key add -
 
-RUN echo "deb http://apt.arvados.org/ xenial-dev main" | tee /etc/apt/sources.list.d/arvados.list
+RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list
 
 RUN apt-get update && apt-get install -qqy tzdata
 
@@ -18,7 +21,7 @@ RUN apt-get update && apt-get install -qqy tzdata
 # 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 remove -qqy arvados-workbench arvados-sso-server 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