From d0f7f6e2f8fb5aa073f46942d066517e2fff5d6d Mon Sep 17 00:00:00 2001 From: Yin Shanyang Date: Wed, 20 Apr 2016 11:37:46 +0200 Subject: [PATCH 1/3] set owner of `app/bootstrap/cache` to `www-data` after `composer install` --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f0d42e4..3eb7132 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja && mv /var/www/invoiceninja-${INVOICENINJA_VERSION} /var/www/app \ && chown -R www-data:www-data /var/www/app \ && composer install --working-dir /var/www/app -o --no-dev --no-interaction --prefer-source\ + && chown -R www-data:www-data /var/www/app/bootstrap/cache \ && mv /var/www/app/storage /var/www/app/docker-backup-storage \ && mv /var/www/app/public/logo /var/www/app/docker-backup-public-logo From 28ff00d785e9b3304f6a3310cb404517dcd7b966 Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Wed, 20 Apr 2016 16:15:57 +0300 Subject: [PATCH 2/3] cp default shared files instead or move fix #5 --- app-entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app-entrypoint.sh b/app-entrypoint.sh index 66a4463..c5f6e82 100644 --- a/app-entrypoint.sh +++ b/app-entrypoint.sh @@ -13,23 +13,23 @@ echo "DB_USERNAME=$DB_USERNAME" >> .env echo "DB_PASSWORD=$DB_PASSWORD" >> .env if [ ! -d /var/www/app/storage ]; then - mv /var/www/app/docker-backup-storage /var/www/app/storage + cp -R /var/www/app/docker-backup-storage /var/www/app/storage else IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)" for path in $IN_STORAGE_BACKUP; do if [ ! -e "/var/www/app/storage/$path" ]; then - mv "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/" + cp -R "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/" fi done fi if [ ! -d /var/www/app/public/logo ]; then - mv /var/www/app/docker-backup-public-logo /var/www/app/public/logo + cp -R /var/www/app/docker-backup-public-logo /var/www/app/public/logo else IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public-logo/)" for path in $IN_LOGO_BACKUP; do if [ ! -e "/var/www/app/public/logo/$path" ]; then - mv "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/" + cp -R "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/" fi done fi From 4da0796c496935c96e7e8d11bfbd29f3377cb390 Mon Sep 17 00:00:00 2001 From: Samuel Laulhau Date: Wed, 20 Apr 2016 17:04:43 +0300 Subject: [PATCH 3/3] copy and preserve permission --- app-entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app-entrypoint.sh b/app-entrypoint.sh index c5f6e82..386968a 100644 --- a/app-entrypoint.sh +++ b/app-entrypoint.sh @@ -13,23 +13,23 @@ echo "DB_USERNAME=$DB_USERNAME" >> .env echo "DB_PASSWORD=$DB_PASSWORD" >> .env if [ ! -d /var/www/app/storage ]; then - cp -R /var/www/app/docker-backup-storage /var/www/app/storage + cp -Rp /var/www/app/docker-backup-storage /var/www/app/storage else IN_STORAGE_BACKUP="$(ls /var/www/app/docker-backup-storage/)" for path in $IN_STORAGE_BACKUP; do if [ ! -e "/var/www/app/storage/$path" ]; then - cp -R "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/" + cp -Rp "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/" fi done fi if [ ! -d /var/www/app/public/logo ]; then - cp -R /var/www/app/docker-backup-public-logo /var/www/app/public/logo + cp -Rp /var/www/app/docker-backup-public-logo /var/www/app/public/logo else IN_LOGO_BACKUP="$(ls /var/www/app/docker-backup-public-logo/)" for path in $IN_LOGO_BACKUP; do if [ ! -e "/var/www/app/public/logo/$path" ]; then - cp -R "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/" + cp -Rp "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/" fi done fi