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

manylinux.common: Fix warning changing ownership of python install

Browse Source 
While the use of sudo (made possible by 53cf084) allows to install
additional packages, the warning copied below was still reported.

To avoid this warning and streamline the installation of new packages,
this commit (1) introduces the concept of "pre_exec" entrypoint hook
and (2) adds such a hook to change the ownership of python "bin" and
"site-packages" directories for the manylinux images.

Warning reported are similar to this one:

```
The directory '/home/jcfr/.cache/pip/http' or its parent directory is
not owned by the current user and the cache has been disabled. Please
check the permissions and owner of that directory. If executing pip
with sudo, you may want sudo's -H flag.
```

Note that the sudo "-H" flag suggested in the warning is not available
in centos.
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-11-04 22:58:31 -04:00
parent 4b7265bde0
commit 8923c6a3c7
No known key found for this signature in database
GPG Key ID: 15C1A2812F958BD3
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.manylinux
View File

@ -7,6 +7,8 @@ RUN cd /opt && \
COPY manylinux-common/install-python-packages.sh /usr/local/bin COPY manylinux-common/install-python-packages.sh /usr/local/bin
RUN /usr/local/bin/install-python-packages.sh RUN /usr/local/bin/install-python-packages.sh
COPY manylinux-common/pre_exec.sh /dockcross/pre_exec.sh
RUN yum -y install sudo && \ RUN yum -y install sudo && \
sed -i 's/Defaults requiretty/#Defaults requiretty/' /etc/sudoers && \ sed -i 's/Defaults requiretty/#Defaults requiretty/' /etc/sudoers && \
visudo -c visudo -c

5
imagefiles/entrypoint.sh
View File

@ -31,6 +31,11 @@ if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then
cp -r /root/* $HOME/ cp -r /root/* $HOME/
chown -R $BUILDER_UID:$BUILDER_GID $HOME/* chown -R $BUILDER_UID:$BUILDER_GID $HOME/*
# Additional updates specific to the image
if [[ -e /dockcross/pre_exec.sh ]]; then
/dockcross/pre_exec.sh
fi
# Run the command as the specified user/group. # Run the command as the specified user/group.
exec chpst -u :$BUILDER_UID:$BUILDER_GID "$@" exec chpst -u :$BUILDER_UID:$BUILDER_GID "$@"
else else

8
manylinux-common/pre_exec.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
for DIR in /opt/python/*/lib/python*/site-packages; do
chown -R $BUILDER_UID:$BUILDER_GID $DIR
done
for DIR in /opt/python/*/bin; do
chown -R $BUILDER_UID:$BUILDER_GID $DIR
done