From 24cc01845d54dce8b1ae68b9fd05171a2ff571f0 Mon Sep 17 00:00:00 2001
From: Rodolfo Berrios <inbox@rodolfoberrios.com>
Date: Thu, 10 Jun 2021 14:39:05 -0400
Subject: [PATCH] adds chevereto folder for dev+custom builds

---
 .gitignore           |  1 +
 chevereto.sh         | 11 ++++++++---
 httpd-php.Dockerfile |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a723ad..47524f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bin/clean.sh
+chevereto/
diff --git a/chevereto.sh b/chevereto.sh
index 6a2b933..11ec26c 100644
--- a/chevereto.sh
+++ b/chevereto.sh
@@ -6,9 +6,13 @@ cd /chevereto/download
 curl -S -o installer.tar.gz -L "https://github.com/chevereto/installer/archive/${CHEVERETO_INSTALLER_TAG}.tar.gz"
 tar -xvzf installer.tar.gz
 mv -v installer-"${CHEVERETO_INSTALLER_TAG}"/* /chevereto/installer/
-cd /chevereto/installer
-php installer.php -a download -s $CHEVERETO_SOFTWARE -t=$CHEVERETO_TAG -l=$CHEVERETO_LICENSE
-php installer.php -a extract -s $CHEVERETO_SOFTWARE -f chevereto-pkg-*.zip -p $WORKING_DIR
+if [ -f "$WORKING_DIR/composer.js" ]; then
+    echo "[SKIP] Installer provisioning"
+else
+    cd /chevereto/installer
+    php installer.php -a download -s $CHEVERETO_SOFTWARE -t=$CHEVERETO_TAG -l=$CHEVERETO_LICENSE
+    php installer.php -a extract -s $CHEVERETO_SOFTWARE -f chevereto-pkg-*.zip -p $WORKING_DIR
+fi
 mkdir -p $WORKING_DIR/app
 set -eux
 {
@@ -45,3 +49,4 @@ set -eux
 } >$WORKING_DIR/app/settings.php
 chown www-data: $WORKING_DIR -R
 cd $WORKING_DIR
+ls -la
diff --git a/httpd-php.Dockerfile b/httpd-php.Dockerfile
index 08d1544..2277b3e 100644
--- a/httpd-php.Dockerfile
+++ b/httpd-php.Dockerfile
@@ -84,5 +84,6 @@ VOLUME /var/www/html/importing/no-parse
 VOLUME /var/www/html/importing/parse-albums
 VOLUME /var/www/html/importing/parse-users
 
+COPY --chown=www-data:www-data chevereto/ /var/www/html
 COPY chevereto.sh /chevereto.sh
 RUN chmod +x /chevereto.sh && /chevereto.sh
\ No newline at end of file