sven/ulogger-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix permissions in docker

Browse Source
This commit is contained in:
Bartek Fabiszewski 2020-01-08 09:42:28 +01:00
parent 4072191170
commit 66c5cc915f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.docker/init.sh
View File

@ -10,6 +10,11 @@ chown nginx:nginx /run/nginx
sed -i "s/^nobody:.*$/nobody:x:1000:50::nobody:\/:\/sbin\/nologin/" /etc/passwd sed -i "s/^nobody:.*$/nobody:x:1000:50::nobody:\/:\/sbin\/nologin/" /etc/passwd
sed -i "s/^nobody:.*$/nobody:x:50:/" /etc/group sed -i "s/^nobody:.*$/nobody:x:50:/" /etc/group
# Prepare ulogger filesystem
grep '^[$<?]' /var/www/html/config.default.php > /var/www/html/config.php
chown nobody:nobody /var/www/html/uploads
chmod 775 /var/www/html/uploads
if [ "$ULOGGER_DB_DRIVER" = "sqlite" ]; then if [ "$ULOGGER_DB_DRIVER" = "sqlite" ]; then
sed -i "s/^\$dbuser = .*$//" /var/www/html/config.php sed -i "s/^\$dbuser = .*$//" /var/www/html/config.php
sed -i "s/^\$dbpass = .*$//" /var/www/html/config.php sed -i "s/^\$dbpass = .*$//" /var/www/html/config.php

4
.travis.yml
View File

@ -57,9 +57,11 @@ after_success:
tx push -s --no-interactive tx push -s --no-interactive
fi fi
after_failure:
- docker logs ulogger
script: script:
- ./vendor/bin/phpunit -c .tests/phpunit.xml || docker logs ulogger - ./vendor/bin/phpunit -c .tests/phpunit.xml
- npm test - npm test
addons: addons:

1
Dockerfile
View File

@ -37,7 +37,6 @@ RUN chown nginx.nginx /etc/nginx/conf.d/default.conf
RUN rm -rf /var/www/html RUN rm -rf /var/www/html
RUN mkdir -p /var/www/html RUN mkdir -p /var/www/html
COPY . /var/www/html COPY . /var/www/html
RUN grep '^[$<?]' /var/www/html/config.default.php > /var/www/html/config.php
RUN /init.sh "${DB_ROOT_PASS}" "${DB_USER_PASS}" RUN /init.sh "${DB_ROOT_PASS}" "${DB_USER_PASS}"