From 267f0c11cd385ff8653c9aad2edc31d751b84395 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Mon, 28 Mar 2022 15:05:37 -0600
Subject: [PATCH] docker-compose: Separate build contexts

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 docs/docker-compose/docker-compose.yml                    | 4 ++--
 docs/docker-compose/start.sh                              | 8 ++------
 .../{Dockerfile-testnode => testnode/Dockerfile}          | 0
 docs/docker-compose/{ => testnode}/testnode_start.sh      | 0
 docs/docker-compose/{ => testnode}/testnode_stop.sh       | 0
 docs/docker-compose/{ => testnode}/testnode_sudoers       | 0
 docs/docker-compose/{ => teuthology}/.teuthology.yaml     | 0
 docs/docker-compose/{ => teuthology}/Dockerfile           | 6 ++++--
 .../{ => teuthology}/containerized_node.yaml              | 0
 docs/docker-compose/{ => teuthology}/teuthology.sh        | 0
 10 files changed, 8 insertions(+), 10 deletions(-)
 rename docs/docker-compose/{Dockerfile-testnode => testnode/Dockerfile} (100%)
 rename docs/docker-compose/{ => testnode}/testnode_start.sh (100%)
 rename docs/docker-compose/{ => testnode}/testnode_stop.sh (100%)
 rename docs/docker-compose/{ => testnode}/testnode_sudoers (100%)
 rename docs/docker-compose/{ => teuthology}/.teuthology.yaml (100%)
 rename docs/docker-compose/{ => teuthology}/Dockerfile (85%)
 rename docs/docker-compose/{ => teuthology}/containerized_node.yaml (100%)
 rename docs/docker-compose/{ => teuthology}/teuthology.sh (100%)

diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml
index df8477ac02..1ef829e400 100644
--- a/docs/docker-compose/docker-compose.yml
+++ b/docs/docker-compose/docker-compose.yml
@@ -76,8 +76,8 @@ services:
       TESTNODES:
   testnode:
     build:
-      context: .
-      dockerfile: ./Dockerfile-testnode
+      context: ./testnode
+      dockerfile: ./Dockerfile
     deploy:
       replicas: 3
     depends_on:
diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 3d812c6a90..32deb153dd 100755
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+pushd teuthology
 if [ -z "$TEUTHOLOGY_BRANCH" -a -n "$GITHUB_HEAD_REF" ]; then
     TEUTHOLOGY_BRANCH=${GITHUB_HEAD_REF}
 fi
@@ -9,6 +10,7 @@ if [ ! -d ./teuthology ]; then
     -b ${TEUTHOLOGY_BRANCH:-$(git branch --show-current)} \
     https://github.com/ceph/teuthology.git
 fi
+popd
 if [ -n "$ANSIBLE_INVENTORY_REPO" ]; then
     basename=$(basename $ANSIBLE_INVENTORY_REPO | cut -d. -f1)
     if [ ! -d "$basename" ]; then
@@ -26,16 +28,10 @@ fi
 # Dockerfile does not cause a build failure when not using this feature.
 mkdir -p teuthology/ansible_inventory/hosts teuthology/ansible_inventory/secrets
 
-cp .teuthology.yaml teuthology/
-cp Dockerfile teuthology/
-cp teuthology.sh teuthology/
-cp containerized_node.yaml teuthology/
 if [ -n "$CUSTOM_CONF" ]; then
     cp "$CUSTOM_CONF" teuthology/
 fi
 
-
-
 # Generate an SSH keypair to use if necessary
 if [ -z "$SSH_PRIVKEY_PATH" ]; then
     SSH_PRIVKEY_PATH=$(mktemp -u /tmp/teuthology-ssh-key-XXXXXX)
diff --git a/docs/docker-compose/Dockerfile-testnode b/docs/docker-compose/testnode/Dockerfile
similarity index 100%
rename from docs/docker-compose/Dockerfile-testnode
rename to docs/docker-compose/testnode/Dockerfile
diff --git a/docs/docker-compose/testnode_start.sh b/docs/docker-compose/testnode/testnode_start.sh
similarity index 100%
rename from docs/docker-compose/testnode_start.sh
rename to docs/docker-compose/testnode/testnode_start.sh
diff --git a/docs/docker-compose/testnode_stop.sh b/docs/docker-compose/testnode/testnode_stop.sh
similarity index 100%
rename from docs/docker-compose/testnode_stop.sh
rename to docs/docker-compose/testnode/testnode_stop.sh
diff --git a/docs/docker-compose/testnode_sudoers b/docs/docker-compose/testnode/testnode_sudoers
similarity index 100%
rename from docs/docker-compose/testnode_sudoers
rename to docs/docker-compose/testnode/testnode_sudoers
diff --git a/docs/docker-compose/.teuthology.yaml b/docs/docker-compose/teuthology/.teuthology.yaml
similarity index 100%
rename from docs/docker-compose/.teuthology.yaml
rename to docs/docker-compose/teuthology/.teuthology.yaml
diff --git a/docs/docker-compose/Dockerfile b/docs/docker-compose/teuthology/Dockerfile
similarity index 85%
rename from docs/docker-compose/Dockerfile
rename to docs/docker-compose/teuthology/Dockerfile
index 11d6deeb6e..5c9285f5f4 100644
--- a/docs/docker-compose/Dockerfile
+++ b/docs/docker-compose/teuthology/Dockerfile
@@ -17,14 +17,16 @@ RUN apt-get update && \
     libyaml-dev \
     lsb-release && \
     apt-get clean all
-COPY . /teuthology
-COPY .teuthology.yaml ./root
 WORKDIR /teuthology
+COPY teuthology /teuthology
 RUN \
+    cd /teuthology && \
     mkdir ../archive_dir && \
     mkdir log && \
     chmod +x /teuthology/bootstrap && \
     ./bootstrap
+COPY containerized_node.yaml /teuthology
+COPY .teuthology.yaml /root
 RUN \
     mkdir $HOME/.ssh && \
     touch $HOME/.ssh/${SSH_PRIVKEY_FILE} && \
diff --git a/docs/docker-compose/containerized_node.yaml b/docs/docker-compose/teuthology/containerized_node.yaml
similarity index 100%
rename from docs/docker-compose/containerized_node.yaml
rename to docs/docker-compose/teuthology/containerized_node.yaml
diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology/teuthology.sh
similarity index 100%
rename from docs/docker-compose/teuthology.sh
rename to docs/docker-compose/teuthology/teuthology.sh
-- 
2.39.5