Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-19 18:20:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

manylinux.crosstool: Fix use of sudo removing sudo provided by devtoolset

Browse Source 
This commit removes sudo provided by devtoolset since it doesn't work with
our sudo wrapper calling gosu.

It fixes error like the following:

  /opt/rh/devtoolset-9/root/usr/bin/sudo: line 41: /usr/bin/sudo: No such file or directory

Adapted from e513a26 (manylinux: Remove rh devtoolset sudo)

Co-authored-by: odidev <odidev@puresoftware.com>
This commit is contained in:
Jean-Christophe Fillion-Robin 2020-06-17 10:21:35 -04:00
parent df070200fa
commit bb9e69988d
No known key found for this signature in database
GPG Key ID: 087FCBD046CD7ADB
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 \
-p "${XCC_PREFIX}" \
-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").
WORKDIR /work

2
common.manylinux
View File

@ -20,7 +20,7 @@ RUN \
yum clean all && \
/buildscripts/install-gosu-binary.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.
rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \
rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \