Merge "Add slave SSH keys"

diff --git a/infra/jenkins/slave-setup/docker-slave/Dockerfile b/infra/jenkins/slave-setup/docker-slave/Dockerfile
index 4a1271d4035cdb1a78cff01597faf1b4ab2fc0f5..78791bbfa584091e7aea63b61984258c66d104fa 100644 (file)
--- a/infra/jenkins/slave-setup/docker-slave/Dockerfile
+++ b/infra/jenkins/slave-setup/docker-slave/Dockerfile
@@ -40,9 +40,11 @@ FROM jenkins/jnlp-slave
 USER root
 # we need few basic packages in order to use base image as Jenkins slave
 RUN apt update
+RUN apt upgrade -o Dpkg::Options::=--force-confdef -o \
+    Dpkg::Options::=--force-confnew -q=3 -y
 RUN apt install -o Dpkg::Options::=--force-confdef -o \
     Dpkg::Options::=--force-confnew -q=3 -y git vim sudo \
-    software-properties-common wget jq
+    software-properties-common wget jq gnupg
 # add ubuntu repos for python3.6-minimal and the key
 RUN add-apt-repository 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu bionic main'
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 3B4FE6ACC0B21F32