Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Improve_CI

Browse Source
This commit is contained in:
Bensuperpc 2021-07-01 00:10:08 +02:00
commit f5daf00817
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.docker
View File

@ -1,7 +1,7 @@
WORKDIR /usr/src WORKDIR /usr/src
ARG GIT_VERSION=2.31.1 ARG GIT_VERSION=2.32.0
ARG CMAKE_VERSION=3.17.1 ARG CMAKE_VERSION=3.20.5
# Image build scripts # Image build scripts
COPY \ COPY \
@ -23,7 +23,7 @@ RUN \
/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/install-cmake-binary.sh $X86_FLAG && \ if [ "$CMAKE_BIN" = "true" ]; then CMAKE_VERSION=3.17.1 && /buildscripts/install-cmake-binary.sh $X86_FLAG;else /buildscripts/build-and-install-cmake.sh $X86_FLAG;fi && \
/buildscripts/install-liquidprompt-binary.sh && \ /buildscripts/install-liquidprompt-binary.sh && \
PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
/buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \

8
imagefiles/build-and-install-cmake.sh
View File

@ -35,8 +35,10 @@ mkdir /usr/src/CMake-build
cd /usr/src/CMake-build cd /usr/src/CMake-build
${WRAPPER} /usr/src/CMake/bootstrap \ ${WRAPPER} /usr/src/CMake/bootstrap \
--parallel=$(grep -c processor /proc/cpuinfo) --parallel=$(nproc) \
${WRAPPER} make -j$(grep -c processor /proc/cpuinfo) -- -DCMAKE_USE_OPENSSL=OFF
${WRAPPER} make -j$(nproc)
mkdir /usr/src/CMake-ssl-build mkdir /usr/src/CMake-ssl-build
cd /usr/src/CMake-ssl-build cd /usr/src/CMake-ssl-build
@ -48,7 +50,7 @@ ${WRAPPER} /usr/src/CMake-build/bin/cmake \
-DCMAKE_USE_OPENSSL:BOOL=ON \ -DCMAKE_USE_OPENSSL:BOOL=ON \
-DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl \ -DOPENSSL_ROOT_DIR:PATH=/usr/local/ssl \
../CMake ../CMake
${WRAPPER} make -j$(grep -c processor /proc/cpuinfo) install ${WRAPPER} make -j$(nproc) install
# Cleanup install tree # Cleanup install tree
cd /usr/src/cmake-$CMAKE_VERSION cd /usr/src/cmake-$CMAKE_VERSION

2
imagefiles/build-and-install-curl.sh
View File

@ -18,7 +18,7 @@ function do_curl_build {
# We do this shared to avoid obnoxious linker issues where git couldn't # We do this shared to avoid obnoxious linker issues where git couldn't
# link properly. If anyone wants to make this build statically go for it. # link properly. If anyone wants to make this build statically go for it.
LIBS=-ldl CFLAGS=-Wl,--exclude-libs,ALL ./configure --with-ssl --disable-static > /dev/null LIBS=-ldl CFLAGS=-Wl,--exclude-libs,ALL ./configure --with-ssl --disable-static > /dev/null
make > /dev/null make -j$(nproc) > /dev/null
make install > /dev/null make install > /dev/null
} }

2
imagefiles/build-and-install-git.sh
View File

@ -32,7 +32,7 @@ rm -f git-${GIT_VERSION}.tar.gz
pushd git-${GIT_VERSION} pushd git-${GIT_VERSION}
./configure --prefix=/usr/local --with-curl ./configure --prefix=/usr/local --with-curl
make make -j$(nproc)
make install make install
popd popd

4
imagefiles/build-and-install-openssl.sh
View File

@ -59,7 +59,7 @@ PERL_DOWNLOAD_URL=https://www.cpan.org/src/5.0
function do_perl_build { function do_perl_build {
${WRAPPER} sh Configure -des -Dprefix=/opt/perl > /dev/null ${WRAPPER} sh Configure -des -Dprefix=/opt/perl > /dev/null
${WRAPPER} make > /dev/null ${WRAPPER} make -j$(nproc) > /dev/null
${WRAPPER} make install > /dev/null ${WRAPPER} make install > /dev/null
} }
@ -78,7 +78,7 @@ function build_perl {
function do_openssl_build { function do_openssl_build {
${WRAPPER} ./config no-shared -fPIC $CONFIG_FLAG --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null ${WRAPPER} ./config no-shared -fPIC $CONFIG_FLAG --prefix=/usr/local/ssl --openssldir=/usr/local/ssl > /dev/null
${WRAPPER} make > /dev/null ${WRAPPER} make -j$(nproc) > /dev/null
${WRAPPER} make install_sw > /dev/null ${WRAPPER} make install_sw > /dev/null
} }

1
manylinux1-x64/Dockerfile.in
View File

@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_x86_64:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
ENV CMAKE_BIN true
#include "common.manylinux" #include "common.manylinux"

1
manylinux1-x86/Dockerfile.in
View File

@ -2,6 +2,7 @@ FROM quay.io/pypa/manylinux1_i686:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
ENV CMAKE_BIN true
#include "common.manylinux" #include "common.manylinux"