bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor global permissions logic / add new directive to alpine/arm DockerFile

Browse Source
This commit is contained in:
dcrdev
2018-07-19 19:29:08 +01:00
parent 1abc76f066
commit 4db9d91957
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile.alpine
View File

@@ -29,6 +29,7 @@ ADD transmission/ /etc/transmission/
ENV OPENVPN_USERNAME=**None** \ ENV OPENVPN_USERNAME=**None** \
OPENVPN_PASSWORD=**None** \ OPENVPN_PASSWORD=**None** \
OPENVPN_PROVIDER=**None** \ OPENVPN_PROVIDER=**None** \
GLOBAL_APPLY_PERMISSIONS=true \
TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_DOWN=50 \
TRANSMISSION_ALT_SPEED_ENABLED=false \ TRANSMISSION_ALT_SPEED_ENABLED=false \
TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \ TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \

1
Dockerfile.armhf
View File

@@ -32,6 +32,7 @@ ADD tinyproxy /opt/tinyproxy/
ENV OPENVPN_USERNAME=**None** \ ENV OPENVPN_USERNAME=**None** \
OPENVPN_PASSWORD=**None** \ OPENVPN_PASSWORD=**None** \
OPENVPN_PROVIDER=**None** \ OPENVPN_PROVIDER=**None** \
GLOBAL_APPLY_PERMISSIONS=true \
TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_DOWN=50 \
TRANSMISSION_ALT_SPEED_ENABLED=false \ TRANSMISSION_ALT_SPEED_ENABLED=false \
TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \ TRANSMISSION_ALT_SPEED_TIME_BEGIN=540 \

38
transmission/userSetup.sh
View File

@@ -4,36 +4,34 @@
RUN_AS=root RUN_AS=root
TEMP_TRAN_DOWNLOAD_DIR=${TRANSMISSION_DOWNLOAD_DIR}
TEMP_TRAN_INCOMPLETE_DIR=${TRANSMISSION_INCOMPLETE_DIR}
TEMP_TRAN_WATCH_DIR=${TRANSMISSION_WATCH_DIR}
if ! [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then
unset TEMP_TRAN_DOWNLOAD_DIR
unset TEMP_TRAN_INCOMPLETE_DIR
unset TEMP_TRAN_WATCH_DIR
fi
if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
RUN_AS=abc RUN_AS=abc
if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then usermod -o -u "$PUID" ${RUN_AS} ; fi if [ ! "$(id -u ${RUN_AS})" -eq "$PUID" ]; then usermod -o -u "$PUID" ${RUN_AS} ; fi
if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then groupmod -o -g "$PGID" ${RUN_AS} ; fi if [ ! "$(id -g ${RUN_AS})" -eq "$PGID" ]; then groupmod -o -g "$PGID" ${RUN_AS} ; fi
echo "Setting owner for transmission paths to ${PUID}:${PGID}" echo "Enforcing ownership on transmission config directories"
chown -R ${RUN_AS}:${RUN_AS} \ chown -R ${RUN_AS}:${RUN_AS} \
/config \ /config \
${TRANSMISSION_HOME} \ ${TRANSMISSION_HOME}
${TEMP_TRAN_DOWNLOAD_DIR} \
${TEMP_TRAN_INCOMPLETE_DIR} \
${TEMP_TRAN_WATCH_DIR}
echo "Setting permission for files (644) and directories (755)" echo "Applying permissions to transmission config directories"
chmod -R go=rX,u=rwX \ chmod -R go=rX,u=rwX \
/config \ /config \
${TRANSMISSION_HOME} \ ${TRANSMISSION_HOME}
${TEMP_TRAN_DOWNLOAD_DIR} \
${TEMP_TRAN_INCOMPLETE_DIR} \ if [ "$GLOBAL_APPLY_PERMISSIONS" = true ] ; then
${TEMP_TRAN_WATCH_DIR} echo "Setting owner for transmission paths to ${PUID}:${PGID}"
chown -R ${RUN_AS}:${RUN_AS} \
${TRANSMISSION_DOWNLOAD_DIR} \
${TRANSMISSION_INCOMPLETE_DIR} \
${TRANSMISSION_WATCH_DIR}
echo "Setting permission for files (644) and directories (755)"
chmod -R go=rX,u=rwX \
${TRANSMISSION_DOWNLOAD_DIR} \
${TRANSMISSION_INCOMPLETE_DIR} \
${TRANSMISSION_WATCH_DIR}
fi
fi fi
echo " echo "