esoko/rvr-nextgen
esoko/rvr-nextgen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Compare commits

base: esoko:ec4d3806ce539f7f3111f19a1bc9aa1e8e2406f8
Branches Tags
esoko:master
esoko:Release_2403.1
esoko:Release_2309.3
esoko:Release_2309.2.1
esoko:Release_2309.2
esoko:Release_2309.1
esoko:Release_2307.4.1
esoko:Release_2307.4
esoko:Release_2307.3
esoko:Release_2307.2
esoko:Release_2307.1
esoko:Release_2306.1
esoko:Release_2305.7.1
esoko:Release_2305.7
esoko:Release_2305.6
esoko:Release_2305.5
esoko:Release_2305.4.1
esoko:Release_2305.4
esoko:Release_2305.3
esoko:Release_2305.2
esoko:Release_2305.1
esoko:Release_2304.15
esoko:Release_2304.14
esoko:Release_2304.13
esoko:Release_2304.12
esoko:Release_2304.11
esoko:Release_2304.10
esoko:Release_2304.9
esoko:Release_2304.8
esoko:Release_2304.7
esoko:Release_2304.6
esoko:Release_2304.5
esoko:Release_2304.4
esoko:Release_2304.3
esoko:Release_2304.2
esoko:Release_2304.1
..
compare: esoko:6341072b0b8c19ad2f559a138901735e8fd583ce
Branches Tags
esoko:master
esoko:Release_2403.1
esoko:Release_2309.3
esoko:Release_2309.2.1
esoko:Release_2309.2
esoko:Release_2309.1
esoko:Release_2307.4.1
esoko:Release_2307.4
esoko:Release_2307.3
esoko:Release_2307.2
esoko:Release_2307.1
esoko:Release_2306.1
esoko:Release_2305.7.1
esoko:Release_2305.7
esoko:Release_2305.6
esoko:Release_2305.5
esoko:Release_2305.4.1
esoko:Release_2305.4
esoko:Release_2305.3
esoko:Release_2305.2
esoko:Release_2305.1
esoko:Release_2304.15
esoko:Release_2304.14
esoko:Release_2304.13
esoko:Release_2304.12
esoko:Release_2304.11
esoko:Release_2304.10
esoko:Release_2304.9
esoko:Release_2304.8
esoko:Release_2304.7
esoko:Release_2304.6
esoko:Release_2304.5
esoko:Release_2304.4
esoko:Release_2304.3
esoko:Release_2304.2
esoko:Release_2304.1

No commits in common. "ec4d3806ce539f7f3111f19a1bc9aa1e8e2406f8" and "6341072b0b8c19ad2f559a138901735e8fd583ce" have entirely different histories.
ec4d3806ce ... 6341072b0b

2 changed files with 8 additions and 16 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -9,14 +9,10 @@ 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..."
if ! getent group rvr; then USER_UID=$(stat -c "%u" .env)
USER_GID=$(stat -c "%g" .env) USER_GID=$(stat -c "%g" .env)
groupadd --gid $USER_GID rvr groupadd --gid $USER_GID rvr
fi useradd --uid $USER_UID --gid $USER_GID rvr
if ! id -u rvr; then
USER_UID=$(stat -c "%u" .env)
useradd --uid $USER_UID --gid $USER_GID rvr
fi
chown -R rvr:rvr cache chown -R rvr:rvr cache
sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/8.1/fpm/pool.d/www.conf sed -i -e "s/^user = .*$/user = rvr/g" -e "s/^group = .*$/group = rvr/g" /etc/php/8.1/fpm/pool.d/www.conf