diff --git a/common.docker b/common.docker index e01c9a1..bf8b2f0 100644 --- a/common.docker +++ b/common.docker @@ -39,11 +39,11 @@ COPY imagefiles/ccmake.sh /usr/local/bin/ccmake # /opt/rh/devtoolset-2/root/usr/bin/sudo expects sudo at this location COPY imagefiles/sudo.sh /usr/bin/sudo -COPY imagefiles/install-ninja.sh /dockcross/ +COPY imagefiles/build-and-install-ninja.sh /dockcross/ RUN \ - /dockcross/install-ninja.sh \ + /dockcross/build-and-install-ninja.sh \ -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ - rm /dockcross/install-ninja.sh + rm /dockcross/build-and-install-ninja.sh RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \ : nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \ diff --git a/imagefiles/install-ninja.sh b/imagefiles/build-and-install-ninja.sh similarity index 91% rename from imagefiles/install-ninja.sh rename to imagefiles/build-and-install-ninja.sh index 8d63883..87d96af 100755 --- a/imagefiles/install-ninja.sh +++ b/imagefiles/build-and-install-ninja.sh @@ -5,7 +5,7 @@ # # Usage: # -# install-ninja.sh [-python /path/to/bin/python] +# build-and-install-ninja.sh [-python /path/to/bin/python] set -e set -o pipefail