esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

do not recreate docker runner group and user #84

Merged
bence merged 1 commits from do-no-recreate-group-and-user into develop 2024-03-11 00:14:36 +01:00
Conversation 0 Commits 1 Files Changed 2 +16 -8
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/scripts/entry-point-dev.sh
View File

@ -19,10 +19,14 @@ echo "Migrating DB..."
./mapg db:migrate ./mapg db:migrate
echo "Set runner user based on owner of .env..." echo "Set runner user based on owner of .env..."
USER_UID=$(stat -c "%u" .env) if ! getent group mapg; then
USER_GID=$(stat -c "%g" .env) USER_GID=$(stat -c "%g" .env)
groupadd --gid $USER_GID mapg groupadd --gid $USER_GID mapg
useradd --uid $USER_UID --gid $USER_GID mapg fi
if ! id -u mapg; then
USER_UID=$(stat -c "%u" .env)
useradd --uid $USER_UID --gid $USER_GID mapg
fi
sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf
set +e set +e

12
docker/scripts/entry-point.sh
View File

@ -9,10 +9,14 @@ echo "Installing crontab..."
/usr/bin/crontab docker/scripts/cron /usr/bin/crontab docker/scripts/cron
echo "Set runner user based on owner of .env..." echo "Set runner user based on owner of .env..."
USER_UID=$(stat -c "%u" .env) if ! getent group mapg; then
USER_GID=$(stat -c "%g" .env) USER_GID=$(stat -c "%g" .env)
groupadd --gid $USER_GID mapg groupadd --gid $USER_GID mapg
useradd --uid $USER_UID --gid $USER_GID mapg fi
if ! id -u mapg; then
USER_UID=$(stat -c "%u" .env)
useradd --uid $USER_UID --gid $USER_GID mapg
fi
chown mapg:mapg cache chown mapg:mapg cache
sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf