For the package test docker images, sanitize how we get the rvm GPG key,

[arvados.git] / build / package-test-dockerfiles / ubuntu1804 / Dockerfile

diff --git a/build/package-test-dockerfiles/ubuntu1804/Dockerfile b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
index 4825dedfd10980c03de59fa700d03cc2b5e78a63..9d326c72946bb645900637ebc852b87c2d253743 100644 (file)
--- a/build/package-test-dockerfiles/ubuntu1804/Dockerfile
+++ b/build/package-test-dockerfiles/ubuntu1804/Dockerfile
@@ -2,15 +2,18 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM ubuntu:xenial
-MAINTAINER Ward Vandewege <ward@curoverse.com>
+FROM ubuntu:bionic
+MAINTAINER Ward Vandewege <wvandewege@veritasgenetics.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install RVM
+# Install dependencies
 RUN apt-get update && \
-    apt-get -y install --no-install-recommends curl ca-certificates && \
-    gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
+    apt-get -y install --no-install-recommends curl ca-certificates gnupg2
+
+# Install RVM
+ADD generated/rvm.asc /tmp/
+RUN gpg --import /tmp/rvm.asc && \
     curl -L https://get.rvm.io | bash -s stable && \
     /usr/local/rvm/bin/rvm install 2.3 && \
     /usr/local/rvm/bin/rvm alias create default ruby-2.3
@@ -18,7 +21,7 @@ RUN apt-get update && \
 # udev daemon can't start in a container, so don't try.
 RUN mkdir -p /etc/udev/disabled
 
-RUN echo "deb file:///arvados/packages/ubuntu1804/ /" >>/etc/apt/sources.list
+RUN echo "deb [trusted=yes] file:///arvados/packages/ubuntu1804/ /" >>/etc/apt/sources.list
 
 # Add preferences file for the Arvados packages. This pins Arvados
 # packages at priority 501, so that older python dependency versions