From 7379ba98b1bc7017d9bd0324e9a2a5b8f4933303 Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Tue, 20 Aug 2019 13:53:24 -0400
Subject: [PATCH] Only the 'user' directory of Grav will be moved and copied
 when needed now

---
 Dockerfile    | 15 ++++++++-------
 entrypoint.sh | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c66d1a3..f11a5bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,16 +38,17 @@ RUN sed -i 's/root \/home\/USER\/www\/html/root \/var\/www/g' /etc/nginx/conf.d/
 RUN (crontab -u nginx -l; echo "* * * * * cd /var/www;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -u nginx -
 
 # Prepare Grav Files
-RUN mkdir -p /var/www /usr/src/grav \
+RUN mkdir -p /var/www /usr/src/grav/user \
     && apk add --no-cache ca-certificates \
     && apk add --no-cache --virtual .install-dependencies unzip wget \
-    && wget -P /usr/src/grav https://github.com/getgrav/grav/releases/download/${GRAV_VERSION}/grav-admin-v${GRAV_VERSION}.zip \
-    && unzip -q /usr/src/grav/grav-admin-v${GRAV_VERSION}.zip -d /usr/src/grav \
-    && rm /usr/src/grav/grav-admin-v${GRAV_VERSION}.zip \
-    && mv -v /usr/src/grav/grav-admin/* /usr/src/grav \
-    && rm -rfv /usr/src/grav/grav-admin \
+    && wget -P /var/www https://github.com/getgrav/grav/releases/download/${GRAV_VERSION}/grav-admin-v${GRAV_VERSION}.zip \
+    && unzip -q /var/www/grav-admin-v${GRAV_VERSION}.zip -d /var/www \
+    && rm /var/www/grav-admin-v${GRAV_VERSION}.zip \
+    && mv -v /var/www/grav-admin/* /var/www \
+    && rm -rfv /var/www/grav-admin \
     && apk del .install-dependencies \
-    && chown -R nginx:nginx /usr/src/grav
+    && chown -R nginx:nginx /var/www \
+    && mv -v /var/www/user /usr/src/grav/user
 
 COPY /entrypoint.sh /
 
diff --git a/entrypoint.sh b/entrypoint.sh
index d973454..73d7781 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,18 +5,18 @@ directory_empty() {
     [ -z "$(ls -A "$1/")" ]
 }
 
-# Copy new Grav files into web directory if no 'user' files are already present
+# Copy Grav 'user' files into /var/www/user if no files are already present
 echo "[ INFO ] Checking for any existing 'user' files"
 if directory_empty "var/www/user"
 then
     echo "[ INFO ] No pre-existing 'user' files found (New instance)"
-    echo "[ INFO ] Copying all Grav files into /var/www/"
-    cp -Ru /usr/src/grav/* /var/www
-    echo "[ INFO ] Default files have been copied successfully"
+    echo "[ INFO ] Copying default Grav 'user' files into /var/www/user"
+    cp -Ru /usr/src/grav/user/* /var/www/user
+    echo "[ INFO ] Default 'user' files have been copied successfully"
 else
     echo "[ INFO ] 'user' directory not empty (Pre-existing instance):"
     ls -A /var/www/user/ | cat -
-    echo "[ INFO ] Not copying new files"
+    echo "[ INFO ] No 'user' files will be copied"
 fi
 
 echo "[ INFO ] Recursively setting default nginx:nginx permissions on web directory"