From 1dc84c571584dc314b8c398775b8e4e47daebca9 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 7 Sep 2020 16:04:06 +0200 Subject: [PATCH] update docker to new standard --- build/docker/README.md | 1 + build/docker/docker-compose.yml | 3 +-- build/docker/docker-run.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build/docker/README.md b/build/docker/README.md index 13b89567766..2fd278a531f 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -28,3 +28,4 @@ The URL to go to PhpMyAdmin is (login/password is root/root) : Setup the database connection during the installation process, please use mariad b (name of the database container) as database host. +Setup documents folder, during the installation process, to /var/documents diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml index 45a1a76d6fc..efdc95d2858 100644 --- a/build/docker/docker-compose.yml +++ b/build/docker/docker-compose.yml @@ -28,8 +28,7 @@ services: - external-pod web: - build: - context: . + build: . environment: HOST_USER_ID: $HOST_USER_ID volumes: diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh index cec7e138b4a..e57d9adfad0 100644 --- a/build/docker/docker-run.sh +++ b/build/docker/docker-run.sh @@ -1,11 +1,18 @@ #!/bin/bash -usermod -u "${HOST_USER_ID}" www-data -groupmod -g "${HOST_USER_ID}" www-data +usermod -u ${HOST_USER_ID} www-data +groupmod -g ${HOST_USER_ID} www-data chgrp -hR www-data /var/www/html chmod g+rwx /var/www/html/conf +if [ ! -d /var/documents ]; then + echo "[docker-run] => create volume directory /var/documents ..." + mkdir -p /var/documents +fi +echo "[docker-run] => Set Permission to www-data for /var/documents" +chown -R www-data:www-data /var/documents + if [ ! -f /usr/local/etc/php/php.ini ]; then cat < /usr/local/etc/php/php.ini date.timezone = $PHP_INI_DATE_TIMEZONE