mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-06-10 21:19:26 +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.
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
# Image build scripts
|
||||
COPY \
|
||||
imagefiles/install-gosu-binary.sh \
|
||||
manylinux-common/install-python-packages.sh \
|
||||
manylinux-common/pre_exec.sh \
|
||||
/dockcross/
|
||||
/buildscripts/
|
||||
|
||||
RUN \
|
||||
set -x && \
|
||||
@ -16,11 +16,12 @@ RUN \
|
||||
zip \
|
||||
&& \
|
||||
yum clean all && \
|
||||
/dockcross/install-gosu-binary.sh && \
|
||||
rm /dockcross/install-gosu-binary.sh && \
|
||||
/buildscripts/install-gosu-binary.sh && \
|
||||
# Remove sudo provided by "devtoolset-2" since it doesn't work with
|
||||
# our sudo wrapper calling gosu.
|
||||
rm /opt/rh/devtoolset-2/root/usr/bin/sudo && \
|
||||
/dockcross/install-python-packages.sh && \
|
||||
rm /dockcross/install-python-packages.sh
|
||||
/buildscripts/install-python-packages.sh && \
|
||||
rm -rf /buildscripts
|
||||
|
||||
# Runtime scripts
|
||||
COPY manylinux-common/pre_exec.sh /dockcross/
|
||||
|
Reference in New Issue
Block a user