bf(ZENKO-1511): Update Ceph CI Image

scality · Mar 1, 2019 · 3b47d0a · 3b47d0a
1 parent 1823d56
commit 3b47d0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/eve/workers/ceph/Dockerfile b/eve/workers/ceph/Dockerfile
@@ -1,4 +1,4 @@
-FROM ceph/daemon
+FROM ceph/daemon:v3.2.1-stable-3.2-mimic-centos-7
 
 ENV CEPH_DAEMON demo
 ENV CEPH_DEMO_DAEMONS mon,mgr,osd,rgw
@@ -13,6 +13,8 @@ ENV MON_IP 0.0.0.0
 ENV NETWORK_AUTO_DETECT 4
 ENV RGW_CIVETWEB_PORT 8001
 
+RUN rm /etc/yum.repos.d/tcmu-runner.repo
+
 ADD ./entrypoint-wrapper.sh /
 RUN chmod +x /entrypoint-wrapper.sh && \
     yum install -y python-pip && \

diff --git a/eve/workers/ceph/entrypoint-wrapper.sh b/eve/workers/ceph/entrypoint-wrapper.sh
@@ -4,7 +4,11 @@ touch /artifacts/ceph.log
 mkfifo /tmp/entrypoint_output
 # We run this in the background so that we can tail the RGW log after init,
 # because entrypoint.sh never returns
-bash entrypoint.sh > /tmp/entrypoint_output &
+
+# The next line will be needed when ceph builds 3.2.2 so I'll leave it here
+# bash /opt/ceph-container/bin/entrypoint.sh > /tmp/entrypoint_output &
+
+bash /entrypoint.sh > /tmp/entrypoint_output &
 entrypoint_pid="$!"
 while read -r line; do
     echo $line