diff --git a/.docker/init.sh b/.docker/init.sh index 9eed9fc..ab95db4 100644 --- a/.docker/init.sh +++ b/.docker/init.sh @@ -46,9 +46,9 @@ if [ "$ULOGGER_DB_DRIVER" = "pgsql" ]; then sed -i "s/^\$dbdsn = .*$/\$dbdsn = \"pgsql:host=localhost;port=5432;dbname=ulogger\";/" /var/www/html/config.php elif [ "$ULOGGER_DB_DRIVER" = "sqlite" ]; then mkdir -p /data/sqlite - chown -R nobody:nobody /data/sqlite sqlite3 -init /var/www/html/scripts/ulogger.sqlite /data/sqlite/ulogger.db .exit sqlite3 -line /data/sqlite/ulogger.db "INSERT INTO users (login, password, admin) VALUES ('${ULOGGER_ADMIN_USER}', '\$2y\$10\$7OvZrKgonVZM9lkzrTbiou.CVhO3HjPk5y0W9L68fVwPs/osBRIMq', 1)" + chown -R nobody:nobody /data/sqlite sed -i "s/^\$dbdsn = .*$/\$dbdsn = \"sqlite:\/data\/sqlite\/ulogger.db\";/" /var/www/html/config.php else sed -i "s|.*skip-networking.*|#skip-networking|g" /etc/my.cnf.d/mariadb-server.cnf diff --git a/Dockerfile b/Dockerfile index 15fc830..c539710 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,15 @@ RUN if [ "${DB_DRIVER}" = "mysql" ]; then apk add --no-cache mariadb mariadb-cli RUN if [ "${DB_DRIVER}" = "pgsql" ]; then apk add --no-cache postgresql postgresql-client php7-pdo_pgsql; fi RUN if [ "${DB_DRIVER}" = "sqlite" ]; then apk add --no-cache sqlite php7-pdo_sqlite; fi +RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ + ln -sf /dev/stdout /var/log/php7/error.log && \ + ln -sf /dev/stderr /var/log/php7/error.log + +RUN rm -rf /var/www/html +RUN mkdir -p /var/www/html + + COPY .docker/run.sh /run.sh RUN chmod +x /run.sh COPY .docker/init.sh /init.sh @@ -27,17 +36,10 @@ RUN chmod +x /init.sh COPY .docker/nginx.conf /etc/nginx/conf.d/default.conf RUN chown nginx.nginx /etc/nginx/conf.d/default.conf -RUN rm -rf /var/www/html -RUN mkdir -p /var/www/html COPY . /var/www/html RUN /init.sh "${DB_ROOT_PASS}" "${DB_USER_PASS}" -RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ - ln -sf /dev/stderr /var/log/nginx/error.log && \ - ln -sf /dev/stdout /var/log/php7/error.log && \ - ln -sf /dev/stderr /var/log/php7/error.log - EXPOSE 80 VOLUME ["/data"]