From 288cb8d25be6c9f6a248a4b1b44254471f8fe3ba Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Fri, 20 Jan 2023 18:18:44 -0600
Subject: [PATCH] Remove -tmp logic

---
 Dockerfile                                            | 2 +-
 Dockerfile.aarch64                                    | 2 +-
 Dockerfile.armhf                                      | 2 +-
 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6802742..1839d1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,7 @@ RUN \
   echo "**** install composer dependencies ****" && \
   composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /app/www /app/www-tmp && \
+  mv /app/www /app/www && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index ed69a01..f8ca346 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -52,7 +52,7 @@ RUN \
   echo "**** install composer dependencies ****" && \
   composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /app/www /app/www-tmp && \
+  mv /app/www /app/www && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index c0ded28..9283445 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -52,7 +52,7 @@ RUN \
   echo "**** install composer dependencies ****" && \
   composer install -d /app/www/ && \
   echo "**** overlay-fs bug workaround ****" && \
-  mv /app/www /app/www-tmp && \
+  mv /app/www /app/www && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
index 616f6fa..a4da96b 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
@@ -1,12 +1,6 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-if [ -d /app/www-tmp ]; then
-    echo "New container detected. Setting up app folder and fixing permissions."
-    mv /app/www-tmp /app/www
-    lsiown -R abc:abc /app/www
-fi
-
 # create directory structure
 mkdir -p \
     /config/www/{uploads,files,images,themes}
@@ -147,6 +141,7 @@ fi
 
 # permissions
 lsiown -R abc:abc \
+    /app/www/storage \
     /config
 
 # set lockfile to avoid DB waits for this specific container