Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-10 05:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
191d773e01
dockcross/common.docker

35 lines
1.1 KiB
Docker
Raw 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/share
base,manylinux-x64: Use sed for Dockerfile composition Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
2016-09-20 19:17:15 +02:00
RUN git clone "https://github.com/nojhan/liquidprompt.git" && \
cd liquidprompt && \
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
git checkout v_1.11
COPY imagefiles/.bashrc /root/
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
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
COPY imagefiles/install-openssl.sh imagefiles/install-cmake.sh /dockcross/
RUN \
if [ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux-x86" ]; then \
/dockcross/install-openssl.sh -32 && \
/dockcross/install-cmake.sh -32 || exit 1; \
else \
/dockcross/install-openssl.sh && \
/dockcross/install-cmake.sh || exit 1; \
fi; \
rm /dockcross/install-openssl.sh /dockcross/install-cmake.sh
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
common.docker: Fix CMake https download building it against openssl 1.0.2j See #63
2016-11-05 16:24:32 +01:00
RUN git clone "https://github.com/ninja-build/ninja.git" && \
base,manylinux-x64: Use sed for Dockerfile composition Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
2016-09-20 19:17:15 +02:00
cd ninja && \
git checkout v1.7.1 && \
([ -e /opt/python/cp35-cp35m/bin/python ] && /opt/python/cp35-cp35m/bin/python ./configure.py --bootstrap) || python ./configure.py --bootstrap && \
./ninja && \
cp ./ninja /usr/bin/ && \
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
cd .. && rm -rf ninja
COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
RUN echo "root:root" | chpasswd
WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"]
COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/
Reference in New Issue Copy Permalink