From 92e54a64ddc85a7f5228f1ba98e512dc6fc56a41 Mon Sep 17 00:00:00 2001
From: Magicalex <magicalex@mondedie.fr>
Date: Fri, 30 Nov 2018 04:47:57 +0100
Subject: [PATCH] fix(): bug file path

---
 README.md                   | 26 ++++++++++++++++++++++----
 rootfs/usr/local/bin/run.sh |  6 +++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 8469674..f28c56b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ services:
     env_file:
       - /mnt/docker/flarum/flarum.env
     volumes:
-      - /mnt/docker/flarum/assets:/flarum/app/assets
+      - /mnt/docker/flarum/assets:/flarum/app/public/assets
       - /mnt/docker/flarum/extensions:/flarum/app/extensions
       - /mnt/docker/flarum/nginx:/etc/nginx/conf.d
     depends_on:
@@ -136,10 +136,27 @@ docker-compose up -d
 
 ### Upgrade to v0.1.0-beta.8 from v0.1.0-beta.7
 
-:warning: Disable 3rd party extensions prior to upgrading.
+:warning: Disable 3rd party extensions prior to upgrading in panel admin.
+
+Add install.txt file in assets folder
+```
+touch /mnt/docker/flarum/assets/installed.txt
+chown $UID: /mnt/docker/flarum/assets/installed.txt
+```
+
+Remove old assets
 
 ```
-docker pull mondedie/docker-flarum:0.1.0-beta.7.1-stable && docker-compose up -d
+cd /mnt/docker/flarum/assets
+rm *.js *.css *.json
+```
+
+Create env file + set chown on this file
+Update your docker-composer file
+
+```
+docker pull mondedie/docker-flarum:0.1.0-beta.8-stable
+docker-compose up -d
 ```
 
 and...
@@ -149,7 +166,8 @@ and...
 :warning: Disable 3rd party extensions prior to upgrading.
 
 ```
-docker pull mondedie/docker-flarum:0.1.0-beta.7.1-stable && docker-compose up -d
+docker pull mondedie/docker-flarum:0.1.0-beta.7.1-stable
+docker-compose up -d
 ```
 
 Navigate to `yourforum.com/admin`, enter your database password and update.
diff --git a/rootfs/usr/local/bin/run.sh b/rootfs/usr/local/bin/run.sh
index 9661337..055a170 100644
--- a/rootfs/usr/local/bin/run.sh
+++ b/rootfs/usr/local/bin/run.sh
@@ -43,7 +43,7 @@ if [ -f '/flarum/app/extensions/composer.repositories.txt' ]; then
     json=$(echo $line | cut -d '|' -f2)
     echo "[INFO] Adding ${repository} composer repository"
     composer config repositories.${repository} "${json}"
-  done < extensions/composer.repositories.txt
+  done < /flarum/app/extensions/composer.repositories.txt
 fi
 
 # Custom vhost flarum nginx
@@ -56,7 +56,7 @@ if [ ! -e '/etc/nginx/conf.d/custom-vhost-flarum.conf' ]; then
 fi
 
 # if no installation was performed before
-if [ -e '/flarum/app/public/assets/install.txt' ]; then
+if [ -e '/flarum/app/public/assets/installed.txt' ]; then
   echo "[INFO] Flarum already installed, init app..."
 
   sed -i -e "s|<DEBUG>|${DEBUG}|g" \
@@ -111,7 +111,7 @@ else
   php /flarum/app/flarum install --file=/flarum/app/config.yml
 
   echo "[INFO] End of flarum installation"
-  echo "Done" > /flarum/app/public/assets/install.txt
+  echo "Done" > /flarum/app/public/assets/installed.txt
 fi
 
 # Set permissions for /flarum folder