Merge pull request #1901 from jcantrill/1839326

openshift-merge-robot · web-flow · commit 4d00dd45d8c9 · 2020-05-27T12:43:31.000-04:00
Bug 1839326: Install python-six first and verify curator is installed upon build
diff --git a/curator/Dockerfile b/curator/Dockerfile
@@ -36,7 +36,8 @@ RUN mkdir -p $(dirname "$CURATOR_CONF_LOCATION") && \
     for pkg in $(ls $HOME/vendor/*.tar.gz); do \
       pip3 install --no-deps $pkg; \
     done  && \
-    rm -rf $HOME/vendor
+    rm -rf $HOME/vendor && \
+    ls /usr/local/bin/curator
 
 WORKDIR ${HOME}
 USER 1001
diff --git a/curator/Dockerfile.centos7 b/curator/Dockerfile.centos7
@@ -38,7 +38,8 @@ RUN mkdir -p $(dirname "$CURATOR_CONF_LOCATION") && \
     for pkg in "$(ls $HOME/vendor/*.tar.gz)" ; do \
       pip3 install --no-deps $pkg; \
     done  && \
-    rm -rf $HOME/vendor
+    rm -rf $HOME/vendor && \
+    ls /usr/local/bin/curator
 
 WORKDIR ${HOME}
 USER 1001
diff --git a/curator/vendor/01_six-1.14.0.tar.gz b/curator/vendor/01_six-1.14.0.tar.gz
