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

manylinux: Use 'common.dockcross' for gosu and dockcross scripts

Browse Source
This commit is contained in:
Nathan Genetzky 2020-06-26 22:42:11 -05:00
parent db2516e650
commit b14ae9b4b0
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.manylinux
View File

@ -1,7 +1,5 @@
# Image build scripts # Image build scripts
COPY \ COPY \
imagefiles/install-gosu-binary.sh \
imagefiles/install-gosu-binary-wrapper.sh \
manylinux-common/install-python-packages.sh \ manylinux-common/install-python-packages.sh \
/buildscripts/ /buildscripts/
@ -18,8 +16,6 @@ RUN \
zip \ zip \
&& \ && \
yum clean all && \ yum clean all && \
/buildscripts/install-gosu-binary.sh && \
/buildscripts/install-gosu-binary-wrapper.sh && \
# Remove sudo provided by devtoolset since it doesn't work with # Remove sudo provided by devtoolset since it doesn't work with
# our sudo wrapper calling gosu. # our sudo wrapper calling gosu.
rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \ rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \

2
manylinux1-x64/Dockerfile.in
View File

@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
#include "common.manylinux" #include "common.manylinux"
#include "common.dockcross"
#include "common.docker" #include "common.docker"
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu

2
manylinux1-x86/Dockerfile.in
View File

@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
#include "common.manylinux" #include "common.manylinux"
#include "common.dockcross"
#include "common.docker" #include "common.docker"
ENV CROSS_TRIPLE i686-linux-gnu ENV CROSS_TRIPLE i686-linux-gnu

2
manylinux2010-x64/Dockerfile.in
View File

@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64
#include "common.manylinux" #include "common.manylinux"
#include "common.dockcross"
#include "common.docker" #include "common.docker"
# Override yum to work around the problem with newly built libcurl.so.4 # Override yum to work around the problem with newly built libcurl.so.4

2
manylinux2010-x86/Dockerfile.in
View File

@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x86
#include "common.manylinux" #include "common.manylinux"
#include "common.dockcross"
#include "common.docker" #include "common.docker"
# Override yum to work around the problem with newly built libcurl.so.4 # Override yum to work around the problem with newly built libcurl.so.4

2
manylinux2014-x64/Dockerfile.in
View File

@ -6,6 +6,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64
#include "common.manylinux" #include "common.manylinux"
#include "common.dockcross"
#include "common.docker" #include "common.docker"
# Override yum to work around the problem with newly built libcurl.so.4 # Override yum to work around the problem with newly built libcurl.so.4