Dockerfile: Write SSH key stubs later in build

We'd rather duplicate this layer than the package-install layer if a
user is going to use both containerized testnodes and "real" ones.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/docs/docker-compose/Dockerfile b/docs/docker-compose/Dockerfile
index adcf8246154124adea497c6908ab6c020a70b53c..11d6deeb6eb99d40064322f02ead59e467ca9c8c 100644 (file)
--- a/docs/docker-compose/Dockerfile
+++ b/docs/docker-compose/Dockerfile
@@ -1,12 +1,6 @@
 FROM ubuntu:latest
 ARG SSH_PRIVKEY_FILE=id_ed25519
 ENV DEBIAN_FRONTEND=noninteractive
-RUN \
-    mkdir $HOME/.ssh && \
-    touch $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
-    chmod 600 $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
-    echo "StrictHostKeyChecking=no" > $HOME/.ssh/config && \
-    echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
 RUN apt-get update && \
     apt-get install -y \
     git \
@@ -31,6 +25,12 @@ RUN \
     mkdir log && \
     chmod +x /teuthology/bootstrap && \
     ./bootstrap
+RUN \
+    mkdir $HOME/.ssh && \
+    touch $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
+    chmod 600 $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
+    echo "StrictHostKeyChecking=no" > $HOME/.ssh/config && \
+    echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
 COPY teuthology.sh /
 RUN mkdir -p /etc/ansible
 COPY ansible_inventory/hosts ansible_inventory/secrets /etc/ansible/