From 66a8685b23d0b10efa31a5c1e0afa26ada9cb5ba Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 17 Jan 2022 14:02:54 -0700 Subject: [PATCH] Dockerfile: Perform teuth setup later in process Should greatly reduce the frequency of package installs during image rebuilds. Signed-off-by: Zack Cerza --- docs/docker-compose/Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/docker-compose/Dockerfile b/docs/docker-compose/Dockerfile index 45e731cbf5..103b8a1a3b 100644 --- a/docs/docker-compose/Dockerfile +++ b/docs/docker-compose/Dockerfile @@ -1,11 +1,6 @@ FROM ubuntu:latest ENV DEBIAN_FRONTEND=nonintercative -COPY . /teuthology -COPY .teuthology.yaml ./root -WORKDIR /teuthology -RUN chmod +x /teuthology/bootstrap && \ - mkdir ../archive_dir && \ - mkdir log && \ +RUN \ mkdir $HOME/.ssh && \ touch $HOME/.ssh/id_ed25519 && \ chmod 600 $HOME/.ssh/id_ed25519 && \ @@ -27,7 +22,14 @@ RUN apt-get update && \ libyaml-dev \ lsb-release && \ apt-get clean all -RUN ./bootstrap +COPY . /teuthology +COPY .teuthology.yaml ./root +WORKDIR /teuthology +RUN \ + mkdir ../archive_dir && \ + mkdir log && \ + chmod +x /teuthology/bootstrap && \ + ./bootstrap CMD echo "$SSH_PRIVKEY" > $HOME/.ssh/id_ed25519 && \ ./virtualenv/bin/teuthology-suite \ -v --ceph-repo https://github.com/ceph/ceph.git \ -- 2.39.5