Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
fix_error
dockcross/common/common.docker

43 lines
1.6 KiB
Docker
Raw Permalink Normal View History

base: Split into Dockerfile.in and common.docker So common.docker can be re-used in other images that are not built FROM base.
2016-09-20 06:35:37 +02:00
WORKDIR /usr/src
common.docker: Ensure openssl-1.0.2j is available in manylinux and linux images If images are any of manylinux-x86, manylinux-x64, linux-x86 or linux-x64, OpenSSL libraries are installed in /usr .
2016-11-18 21:30:03 +01:00
Update CMake to 3.20.5 and git to 2.32.0 Update CMake to 3.20.5 and git to 2.32.0 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-30 09:08:40 +02:00
ARG GIT_VERSION=2.32.0
Update CMake to 3.21.1 Update CMake to 3.21.1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-08-06 22:54:32 +02:00
ARG CMAKE_VERSION=3.21.1
bump flatcc to fix issue building flatcc runtime on GCC 11
2022-03-30 15:45:08 +02:00
ARG FLATCC_VERSION=d90ed18ad09824297ffd5fbc578ccb1666d13890
ENH: Compile git with SSL support Older versions of git included in older linux distributions are not able to download source from Github. A newer version is required with a newer OpenSSL. This requires to also build curl with the same OpenSSL. CMake is downloaded precompiled if available (64bits system) or compiled from source otherwise.
2018-04-13 20:56:49 +02:00
common.*: Clearly differentiate runtime and buildtime scripts Simplify all common.* files by simply removing the "buildscripts" directory instead of listing each script one by one.
2018-06-07 02:17:10 +02:00
# Image build scripts
STYLE: Tweak indent in common.debian and common.docker
2018-06-05 05:53:38 +02:00
COPY \
common.docker: Alphabetically list scripts in COPY instruction
2018-06-07 02:27:20 +02:00
imagefiles/build-and-install-cmake.sh \
imagefiles/build-and-install-curl.sh \
add flatcc to Dockcross base image
2022-02-28 19:54:59 +01:00
imagefiles/build-and-install-flatcc.sh \
STYLE: Tweak indent in common.debian and common.docker
2018-06-05 05:53:38 +02:00
imagefiles/build-and-install-git.sh \
common.docker: Alphabetically list scripts in COPY instruction
2018-06-07 02:27:20 +02:00
imagefiles/build-and-install-ninja.sh \
ENH: Compile git with SSL support Older versions of git included in older linux distributions are not able to download source from Github. A newer version is required with a newer OpenSSL. This requires to also build curl with the same OpenSSL. CMake is downloaded precompiled if available (64bits system) or compiled from source otherwise.
2018-04-13 20:56:49 +02:00
imagefiles/build-and-install-openssl.sh \
imagefiles/build-and-install-openssh.sh \
imagefiles/install-cmake-binary.sh \
common.docker: Optimize image size installing "liquidprompt" in existing RUN command
2018-06-05 05:48:09 +02:00
imagefiles/install-liquidprompt-binary.sh \
Centralize python packages installation adding "install-python-packages" script
2018-06-07 02:58:31 +02:00
imagefiles/install-python-packages.sh \
common.docker: Alphabetically list scripts in COPY instruction
2018-06-07 02:27:20 +02:00
imagefiles/utils.sh \
common.*: Clearly differentiate runtime and buildtime scripts Simplify all common.* files by simply removing the "buildscripts" directory instead of listing each script one by one.
2018-06-07 02:17:10 +02:00
/buildscripts/
ENH: Compile git with SSL support Older versions of git included in older linux distributions are not able to download source from Github. A newer version is required with a newer OpenSSL. This requires to also build curl with the same OpenSSL. CMake is downloaded precompiled if available (64bits system) or compiled from source otherwise.
2018-04-13 20:56:49 +02:00
common.docker: Improve OpenSSL and CMake install introducing helper scripts To accommodate the requirements associated with x86 and x64 images, the command building OpenSSL and CMake became overly complex and hard to maintain. This commit has multiple purposes: (1) simplify common.docker (2) fix the building of 64-bit shared libraries against the static openssl libraries by passing the -fPIC flag. (3) ensure [many]linux-x86 and [many]linux-x64 images have an up-to-date OpenSSL install. Openssl static libraries are installed in /usr (4) simplify and speedup CMake build avoiding the second build with explicit -DCMAKE_USE_OPENSSL:BOOL=ON. Indeed, configuring CMake on Linux already looks for OpenSSL. (5) speedup download of CMake source directly downloading the archive corresponding to the revision. (6) test CMake by: - running CMake.FileDownload test - trying to download a file served over https
2016-11-21 12:08:30 +01:00
RUN \
remove manylinux2010 and manylinux1 images remove manylinux2010 and manylinux1 images Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-08-05 19:06:40 +02:00
X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \
common.docker: Speed-up manylinux-x86 image build downloading CMake binary x86 version of CMake compatible with Centos5 is now available at https://github.com/dockbuild/CMake/releases
2018-06-09 20:14:19 +02:00
/buildscripts/build-and-install-openssl.sh $X86_FLAG && \
/buildscripts/build-and-install-openssh.sh && \
/buildscripts/build-and-install-curl.sh && \
/buildscripts/build-and-install-git.sh && \
Fix CMake error on manylinux1 Fix CMake error on manylinux1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-30 15:07:13 +02:00
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 && \
common.*: Clearly differentiate runtime and buildtime scripts Simplify all common.* files by simply removing the "buildscripts" directory instead of listing each script one by one.
2018-06-07 02:17:10 +02:00
/buildscripts/install-liquidprompt-binary.sh && \
Upgrade to debian Buster and disable python builder script Upgrade to debian Buster slim (later to debian bullseye, crosstool-ng must be updated first, version 1.23 is not compatible with debian bullseye) Disable python script (build-and-install-python.sh), the version of python in the repositories is recent enough for crosstool-ng 1.24 and above. Changed from python to python3 for compatibility Adding the manual launch of a github workflow Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-24 22:57:41 +02:00
PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
Centralize python packages installation adding "install-python-packages" script
2018-06-07 02:58:31 +02:00
/buildscripts/install-python-packages.sh -python ${PYTHON} && \
common.*: Clearly differentiate runtime and buildtime scripts Simplify all common.* files by simply removing the "buildscripts" directory instead of listing each script one by one.
2018-06-07 02:17:10 +02:00
/buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
add flatcc to Dockcross base image
2022-02-28 19:54:59 +01:00
/buildscripts/build-and-install-flatcc.sh && \
Centralize python packages installation adding "install-python-packages" script
2018-06-07 02:58:31 +02:00
rm -rf /buildscripts
base: Split into Dockerfile.in and common.docker So common.docker can be re-used in other images that are not built FROM base.
2016-09-20 06:35:37 +02:00
RUN echo "root:root" | chpasswd
WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"]
common.*: Clearly differentiate runtime and buildtime scripts Simplify all common.* files by simply removing the "buildscripts" directory instead of listing each script one by one.
2018-06-07 02:17:10 +02:00
# Runtime scripts
COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
Reference in New Issue Copy Permalink