Bump everything up to the latest stable release (1.3.1), and use Ubuntu 18.04

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

diff --git a/dockerfiles/Dockerfile.shell_server-runtime b/dockerfiles/Dockerfile.shell_server-runtime
index 2ac37d684ae0a57e27b83fa284d22f104e6bfdad..1b4cc65ce11b5bf7fada704d967fd0ff53158937 100644 (file)
--- a/dockerfiles/Dockerfile.shell_server-runtime
+++ b/dockerfiles/Dockerfile.shell_server-runtime
@@ -2,11 +2,14 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM phusion/baseimage
+FROM phusion/baseimage:master
 
-RUN /usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
+RUN apt-get update && apt-get install -y gnupg2
 
-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
+
+ADD 1078ECD7.asc /tmp/
+RUN cat /tmp/1078ECD7.asc | apt-key add -
 
 RUN apt-get update && apt-get install -qqy tzdata