From b92bb4aa213cb42ea9e23059c286c11ed3098a1e Mon Sep 17 00:00:00 2001
From: William Miceli <1-WilliamMiceli@git.williammiceli.systems>
Date: Tue, 20 Aug 2019 13:26:00 -0400
Subject: [PATCH] Default files will be saved to /user/src/grav now instead of
 being put into an archive file

---
 Dockerfile    | 20 ++++++++------------
 entrypoint.sh | 16 ++++++++--------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e75f669..c66d1a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -38,22 +38,18 @@ 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 \
+RUN mkdir -p /var/www /usr/src/grav \
     && apk add --no-cache ca-certificates \
     && apk add --no-cache --virtual .install-dependencies unzip wget \
-    && 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 /var/www/grav-admin/* /var/www/ \
-    && rm -rfv /var/www/grav-admin \
+    && 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 \
     && apk del .install-dependencies \
-    && chown -R nginx:nginx /var/www \
-    && tar -cz -f /GRAV.tar.gz /var/www \
-    && rm -r /var/www*
+    && chown -R nginx:nginx /usr/src/grav
 
 COPY /entrypoint.sh /
 
-VOLUME /var/www/
-
 EXPOSE 80
-CMD ["sh", "/entrypoint.sh"]
\ No newline at end of file
+CMD ["/bin/sh", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index aca7539..d973454 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,18 +5,18 @@ directory_empty() {
     [ -z "$(ls -A "$1/")" ]
 }
 
-# Extract new Grav files if no user files are already present
-echo "[ INFO ] Checking for any existing user files"
+# Copy new Grav files into web directory if no 'user' 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 ] Extracting all Grav files into /var/www/"
-    tar xz -f /GRAV.tar.gz -C /
-    echo "[ INFO ] Default files have been extracted successfully"
+    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"
 else
     echo "[ INFO ] 'user' directory not empty (Pre-existing instance):"
-    ls -A /var/www/user/
-    echo "[ INFO ] Not extracting new files from archive"
+    ls -A /var/www/user/ | cat -
+    echo "[ INFO ] Not copying new files"
 fi
 
 echo "[ INFO ] Recursively setting default nginx:nginx permissions on web directory"