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

Merge pull request #421 from dockcross/manylinux-crosstool-sudo

Browse Source 
manylinux.crosstool: Fix use of sudo removing sudo provided by devtoolset
This commit is contained in:
Jean-Christophe Fillion-Robin 2020-06-18 17:35:32 -04:00 committed by GitHub
commit 0c663c2f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common-manylinux.crosstool
View File

@ -57,7 +57,10 @@ RUN \
/dockcross/install-crosstool-ng-toolchain.sh \ /dockcross/install-crosstool-ng-toolchain.sh \
-p "${XCC_PREFIX}" \ -p "${XCC_PREFIX}" \
-c /dockcross/crosstool-ng.config && \ -c /dockcross/crosstool-ng.config && \
rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
# Remove sudo provided by devtoolset since it doesn't work with
# our sudo wrapper calling gosu.
rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo
# Restore our default workdir (from "dockcross/base"). # Restore our default workdir (from "dockcross/base").
WORKDIR /work WORKDIR /work

2
common.manylinux
View File

@ -20,7 +20,7 @@ RUN \
yum clean all && \ yum clean all && \
/buildscripts/install-gosu-binary.sh && \ /buildscripts/install-gosu-binary.sh && \
/buildscripts/install-gosu-binary-wrapper.sh && \ /buildscripts/install-gosu-binary-wrapper.sh && \
# Remove sudo provided by "devtoolset-2" and "devtoolset-8" 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 && \
rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \ rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \