gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-20 07:51:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't fail on uid/gid change

Browse Source
This commit is contained in:
cytopia
2020-11-13 00:32:31 +01:00
parent d926629879
commit 04c051e72f
15 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -7,7 +7,7 @@
## Release 0.115 ## Release 0.115
#### Fixed #### Fixed
- [#703](https://github.com/cytopia/devilbox/issues/703) Allow big uid's and gid's - [#703](https://github.com/cytopia/devilbox/issues/703) Don't fail on uid/gid change
## Release 0.114 ## Release 0.114

4
Dockerfiles/base/Dockerfile-5.2
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-5.3
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-5.4
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-5.5
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-5.6
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-7.0
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-7.1
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-7.2
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-7.3
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-7.4
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-8.0
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

4
Dockerfiles/base/Dockerfile-8.1
View File

@@ -37,9 +37,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###

16
Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh
View File

@@ -60,10 +60,15 @@ set_uid() {
fi fi
# Change uid and fix homedir permissions # Change uid and fix homedir permissions
log "info" "Changing user '${username}' uid to: ${uid}" "${debug}" log "info" "Changing user '${username}' uid to: ${uid}" "${debug}"
if ! run "usermod -u ${uid} ${username} 2>/dev/null" "${debug}"; then
run "usermod -u ${uid} ${username}" "${debug}" run "usermod -u ${uid} ${username}" "${debug}"
run "chown -R ${username} ${homedir} || true" "${debug}" fi
run "chown -R ${username} ${homedir} 2>/dev/null || true" "${debug}"
run "chown -R ${username} /var/lib/php/session" "${debug}" run "chown -R ${username} /var/lib/php/session" "${debug}"
run "chown -R ${username} /var/lib/php/wsdlcache" "${debug}" run "chown -R ${username} /var/lib/php/wsdlcache" "${debug}"
if [ -f "/var/spool/mail/devilbox" ]; then
run "chown -R ${username} /var/spool/mail/devilbox" "${debug}"
fi
fi fi
fi fi
} }
@@ -100,12 +105,17 @@ set_gid() {
run "groupmod -g ${spare_gid} ${target_groupname}" "${debug}" run "groupmod -g ${spare_gid} ${target_groupname}" "${debug}"
fi fi
fi fi
# Change ugd and fix homedir permissions # Change gid and fix homedir permissions
log "info" "Changing group '${groupname}' gid to: ${gid}" "${debug}" log "info" "Changing group '${groupname}' gid to: ${gid}" "${debug}"
if ! run "groupmod -g ${gid} ${groupname} 2>/dev/null" "${debug}"; then
run "groupmod -g ${gid} ${groupname}" "${debug}" run "groupmod -g ${gid} ${groupname}" "${debug}"
run "chown -R :${groupname} ${homedir} || true" "${debug}" fi
run "chown -R :${groupname} ${homedir} 2>/dev/null || true" "${debug}"
run "chown -R :${groupname} /var/lib/php/session" "${debug}" run "chown -R :${groupname} /var/lib/php/session" "${debug}"
run "chown -R :${groupname} /var/lib/php/wsdlcache" "${debug}" run "chown -R :${groupname} /var/lib/php/wsdlcache" "${debug}"
if [ -f "/var/spool/mail/devilbox" ]; then
run "chown -R :${groupname} /var/spool/mail/devilbox" "${debug}"
fi
fi fi
fi fi
} }

4
build/ansible/DOCKERFILES/Dockerfile-base.j2
View File

@@ -47,9 +47,7 @@ ENV MY_USER="devilbox" \
### ###
RUN set -eux \ RUN set -eux \
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
&& sed -i'' 's/^UID_MAX.*/UID_MAX 10000000/g' /etc/login.defs \
&& sed -i'' 's/^GID_MAX.*/GID_MAX 10000000/g' /etc/login.defs
### ###