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

set runner user of web service

Browse Source
This commit is contained in:
Bence Pőcze 2023-09-26 21:39:49 +02:00
parent fc6141e2b9
commit c7f5ea0d85
Signed by: bence
GPG Key ID: DC5BD6E95A333E6D
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/Dockerfile
View File

@ -2,7 +2,7 @@ FROM ubuntu:focal AS mapg_base
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt update --fix-missing && apt install -y curl git unzip mariadb-client nginx \ RUN apt update --fix-missing && apt install -y sudo curl git unzip mariadb-client nginx \
php-apcu php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml php-apcu php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
RUN mkdir -p /run/php RUN mkdir -p /run/php
@ -30,6 +30,7 @@ EXPOSE 8090
EXPOSE 9229 EXPOSE 9229
ENTRYPOINT docker/scripts/entry-point-dev.sh ENTRYPOINT docker/scripts/entry-point-dev.sh
FROM mapg_base AS mapg_release FROM mapg_base AS mapg_release
RUN apt update --fix-missing && apt install -y cron RUN apt update --fix-missing && apt install -y cron
@ -37,7 +38,7 @@ RUN apt update --fix-missing && apt install -y cron
WORKDIR /var/www/mapguesser WORKDIR /var/www/mapguesser
COPY ./ /var/www/mapguesser COPY ./ /var/www/mapguesser
RUN docker/scripts/release.sh &&\ RUN docker/scripts/release.sh &&\
rm -rf /var/www/mapguesser/.git /var/www/mapguesser/.env rm -rf /var/www/mapguesser/.git
EXPOSE 80 EXPOSE 80
EXPOSE 8090 EXPOSE 8090

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

@ -2,8 +2,6 @@
set -e set -e
chmod 777 cache
echo "Installing Composer packages..." echo "Installing Composer packages..."
if [ -f .env ]; then if [ -f .env ]; then
composer install composer install
@ -20,11 +18,18 @@ echo "Installing Yarn packages..."
echo "Migrating DB..." echo "Migrating DB..."
./mapg db:migrate ./mapg db:migrate
echo "Set runner user based on owner of .env..."
USER_UID=$(stat -c "%u" .env)
USER_GID=$(stat -c "%g" .env)
groupadd --gid $USER_GID mapg
useradd --uid $USER_UID --gid $USER_GID mapg
sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/7.4/fpm/pool.d/www.conf
set +e set +e
/usr/sbin/php-fpm7.4 -F & /usr/sbin/php-fpm7.4 -F &
/usr/sbin/nginx -g 'daemon off;' & /usr/sbin/nginx -g 'daemon off;' &
/usr/bin/node --inspect=0.0.0.0:9229 multi & sudo -u mapg -g mapg /usr/bin/node --inspect=0.0.0.0:9229 multi &
wait -n wait -n

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

@ -8,12 +8,20 @@ echo "Migrating DB..."
echo "Installing crontab..." echo "Installing crontab..."
/usr/bin/crontab docker/scripts/cron /usr/bin/crontab docker/scripts/cron
echo "Set runner user based on owner of .env..."
USER_UID=$(stat -c "%u" .env)
USER_GID=$(stat -c "%g" .env)
groupadd --gid $USER_GID mapg
useradd --uid $USER_UID --gid $USER_GID mapg
chown mapg:mapg cache
sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/7.4/fpm/pool.d/www.conf
set +e set +e
/usr/sbin/cron -f & /usr/sbin/cron -f &
/usr/sbin/php-fpm7.4 -F & /usr/sbin/php-fpm7.4 -F &
/usr/sbin/nginx -g 'daemon off;' & /usr/sbin/nginx -g 'daemon off;' &
/usr/bin/node multi & sudo -u mapg -g mapg /usr/bin/node multi &
wait -n wait -n

4
docker/scripts/release.sh
View File

@ -2,8 +2,6 @@
set -e set -e
chmod 777 cache
echo "Installing Composer packages..." echo "Installing Composer packages..."
composer create-project --no-dev composer create-project --no-dev
@ -28,3 +26,5 @@ find public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;
echo "Linking view files..." echo "Linking view files..."
./mapg view:link ./mapg view:link
rm .env