Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-04-03 12:39:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

common.docker: Speed-up manylinux-x86 image build downloading CMake binary

Browse Source 
x86 version of CMake compatible with Centos5 is now available at
https://github.com/dockbuild/CMake/releases
This commit is contained in:
Jean-Christophe Fillion-Robin 2018-06-09 14:14:19 -04:00
parent aa202df283
commit 2e1e18e187
No known key found for this signature in database
GPG Key ID: BAF1E1AEB9097A41
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common.docker
View File

@ -18,26 +18,18 @@ COPY \
/buildscripts/ /buildscripts/
RUN \ RUN \
if [ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ]; then \ X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ] && echo "-32" || echo "") && \
/buildscripts/build-and-install-openssl.sh -32 && \ /buildscripts/build-and-install-openssl.sh $X86_FLAG && \
/buildscripts/build-and-install-openssh.sh && \ /buildscripts/build-and-install-openssh.sh && \
/buildscripts/build-and-install-curl.sh && \ /buildscripts/build-and-install-curl.sh && \
/buildscripts/build-and-install-git.sh && \ /buildscripts/build-and-install-git.sh && \
/buildscripts/build-and-install-cmake.sh -32 || exit 1; \ /buildscripts/install-cmake-binary.sh $X86_FLAG && \
else \
/buildscripts/build-and-install-openssl.sh && \
/buildscripts/build-and-install-openssh.sh && \
/buildscripts/build-and-install-curl.sh && \
/buildscripts/build-and-install-git.sh && \
/buildscripts/install-cmake-binary.sh || exit 1; \
fi; \
/buildscripts/install-liquidprompt-binary.sh && \ /buildscripts/install-liquidprompt-binary.sh && \
PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ PYTHON=$([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
/buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \
/buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
rm -rf /buildscripts rm -rf /buildscripts
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
WORKDIR /work WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"] ENTRYPOINT ["/dockcross/entrypoint.sh"]

18
imagefiles/install-cmake-binary.sh
View File

@ -1,6 +1,22 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
set -o pipefail
ARCH="x86_64"
while [ $# -gt 0 ]; do
case "$1" in
-32)
ARCH="x86"
;;
*)
echo "Usage: Usage: ${0##*/} [-32]"
exit 1
;;
esac
shift
done
if ! command -v curl &> /dev/null; then if ! command -v curl &> /dev/null; then
echo >&2 'error: "curl" not found!' echo >&2 'error: "curl" not found!'
@ -19,7 +35,7 @@ fi
cd /usr/src cd /usr/src
CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-x86_64 CMAKE_ROOT=cmake-${CMAKE_VERSION}-Centos5-${ARCH}
url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz url=https://github.com/dockbuild/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_ROOT}.tar.gz
echo "Downloading $url" echo "Downloading $url"
curl -# -LO $url curl -# -LO $url