From: Zack Cerza <zack@redhat.com>
Date: Thu, 20 Jan 2022 19:47:47 +0000 (-0700)
Subject: Dockerfile: Split out entrypoint to teuthology.sh
X-Git-Tag: 1.2.0~190^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6271b83b562bde4afbc1e498ef1d99fc1e59ea45;p=teuthology.git

Dockerfile: Split out entrypoint to teuthology.sh

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

diff --git a/docs/docker-compose/Dockerfile b/docs/docker-compose/Dockerfile
index 103b8a1a3..e10fe7ed7 100644
--- a/docs/docker-compose/Dockerfile
+++ b/docs/docker-compose/Dockerfile
@@ -30,12 +30,5 @@ RUN \
     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 \
-    --suite-repo https://github.com/ceph/ceph.git \
-    -c master -m testnode --subset 9000/100000 --limit 1 \
-    --suite dummy \
-    --suite-branch master -p 75 --force-priority -n 100 && \
-    ./virtualenv/bin/teuthology-dispatcher --log-dir ./log --tube testnode ; \
-    tail -f /dev/null
+COPY teuthology.sh /
+ENTRYPOINT /teuthology.sh
\ No newline at end of file
diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
new file mode 100755
index 000000000..9915c69a0
--- /dev/null
+++ b/docs/docker-compose/teuthology.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/bash
+set -e
+# We don't want -x yet, in case the private key is sensitive
+echo "$SSH_PRIVKEY" > $HOME/.ssh/id_ed25519
+set -x
+./virtualenv/bin/teuthology-suite -v \
+    --ceph-repo https://github.com/ceph/ceph.git \
+    --suite-repo https://github.com/ceph/ceph.git \
+    -c master \
+    -m testnode \
+    --limit 1 \
+    -n 100 \
+    --suite dummy \
+    --suite-branch master \
+    --subset 9000/100000 \
+    -p 75 \
+    --force-priority
+./virtualenv/bin/teuthology-dispatcher --log-dir ./log --tube testnode
+tail -f /dev/null
\ No newline at end of file