ich777/docker-steamcmd-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #19 from Ornias1993/patch-1

Browse Source 
ensure group is linked correctly
This commit is contained in:
Christoph Hummer
2022-04-07 16:58:05 +02:00
committed by GitHub
parent 5e4b466e76 27f2c6ee47
commit 82b45708e5
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -33,4 +33,4 @@ ADD /scripts/ /opt/scripts/
RUN chmod -R 770 /opt/scripts/ RUN chmod -R 770 /opt/scripts/
#Server Start #Server Start
ENTRYPOINT ["/opt/scripts/start.sh"] ENTRYPOINT ["/opt/scripts/start.sh"]

23
scripts/start.sh
View File

@@ -1,25 +1,30 @@
#!/bin/bash #!/bin/bash
echo "---Checking if UID: ${UID} matches user---" echo "---Ensuring UID: ${UID} matches user---"
usermod -u ${UID} ${USER} usermod -u ${UID} ${USER}
echo "---Checking if GID: ${GID} matches user---" echo "---Ensuring GID: ${GID} matches user---"
groupmod -g ${GID} ${USER} > /dev/null 2>&1 ||:
usermod -g ${GID} ${USER} usermod -g ${GID} ${USER}
echo "---Setting umask to ${UMASK}---" echo "---Setting umask to ${UMASK}---"
umask ${UMASK} umask ${UMASK}
echo "---Checking for optional scripts---" echo "---Checking for optional scripts---"
if [ -f /opt/scripts/user.sh ]; then cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
echo "---Found optional script, executing---" cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||:
chmod +x /opt/scripts/user.sh
/opt/scripts/user.sh if [ -f /opt/scripts/start-user.sh ]; then
echo "---Found optional script, executing---"
chmod -f +x /opt/scripts/start-user.sh.sh ||:
/opt/scripts/start-user.sh || echo "---Optional Script has thrown an Error---"
else else
echo "---No optional script found, continuing---" echo "---No optional script found, continuing---"
fi fi
echo "---Starting...---" echo "---Taking ownership of data...---"
chown -R root:${GID} /opt/scripts chown -R root:${GID} /opt/scripts
chmod -R 750 /opt/scripts chmod -R 750 /opt/scripts
chown -R ${UID}:${GID} ${DATA_DIR} chown -R ${UID}:${GID} ${DATA_DIR}
echo "---Starting...---"
term_handler() { term_handler() {
kill -SIGTERM "$killpid" kill -SIGTERM "$killpid"
wait "$killpid" -f 2>/dev/null wait "$killpid" -f 2>/dev/null
@@ -33,4 +38,4 @@ while true
do do
wait $killpid wait $killpid
exit 0; exit 0;
done done