From 701d9602c6caaeb9ff62f193dcff2214ba250fc7 Mon Sep 17 00:00:00 2001
From: Sam <sam@lalop.co>
Date: Sun, 29 Nov 2015 20:16:49 +0100
Subject: [PATCH] regen shared paths fix #1

---
 Dockerfile        |  4 +++-
 app-entrypoint.sh | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index a0bcac4..c1a9f24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,9 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
     && rm invoiceninja.tar.gz \
     && 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
+    && composer install --working-dir /var/www/app -o --no-dev --no-interaction \
+    && mv /var/www/app/storage /var/www/app/docker-backup-storage \
+    && mv /var/www/app/public/logo /var/www/app/docker-backup-public-logo
 
 
 ######
diff --git a/app-entrypoint.sh b/app-entrypoint.sh
index a346328..a6be385 100644
--- a/app-entrypoint.sh
+++ b/app-entrypoint.sh
@@ -12,6 +12,28 @@ fi
 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
+else
+	IN_STORAGE_BACKUP = "$(ls /var/www/app/docker-backup-storage/)"
+	for path in "$IN_STORAGE_BACKUP"; do
+		if [ ! -a "/var/www/app/storage/$path" ]; then
+			mv "/var/www/app/docker-backup-storage/$path" "/var/www/app/storage/$path"
+		fi
+	done
+fi
+
+if [ ! -d /var/www/app/public/logo ]; then
+	mv /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 [ ! -a "/var/www/app/public/logo/$path" ]; then
+			mv "/var/www/app/docker-backup-public-logo/$path" "/var/www/app/public/logo/$path"
+		fi
+	done
+fi
+
 chown www-data .env
 
 exec "$@"