Move everything to /var/www/bookstack

Signed-off-by: solidnerd <niclas@mietz.io>

Author: solidnerd

Dockerfile

@@ -1,7 +1,8 @@
 FROM php:7.0-apache
 
 ENV BOOKSTACK=BookStack \
-    BOOKSTACK_VERSION=0.15.0
+    BOOKSTACK_VERSION=0.15.0 \
+    BOOKSTACK_HOME="/var/www/bookstack"
 
 RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget libldap2-dev libtidy-dev \
    && docker-php-ext-install pdo pdo_mysql mbstring zip tidy \
@@ -12,9 +13,9 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
    && cd /var/www && curl -sS https://getcomposer.org/installer | php \
    && mv /var/www/composer.phar /usr/local/bin/composer \
    && wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
-   && tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK} && rm ${BOOKSTACK}.tar.gz  \
-   && cd /var/www/BookStack && composer install \
-   && chown -R www-data:www-data /var/www/BookStack \
+   && tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz  \
+   && cd $BOOKSTACK_HOME && composer install \
+   && chown -R www-data:www-data $BOOKSTACK_HOME \
    && apt-get -y autoremove \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
@@ -24,6 +25,8 @@ RUN a2enmod rewrite
 
 COPY docker-entrypoint.sh /
 
+WORKDIR $BOOKSTACK_HOME
+
 EXPOSE 80
 
 ENTRYPOINT ["/docker-entrypoint.sh"]

bookstack.conf

@@ -1,8 +1,8 @@
 <VirtualHost *:80>
     ServerName bookstack.dev
-    DocumentRoot "/var/www/BookStack/public/"
+    DocumentRoot "/var/www/bookstack/public/"
 
-    <Directory "/var/www/BookStack/">
+    <Directory "/var/www/bookstack/">
         Options FollowSymLinks MultiViews
         AllowOverride All
         Require all granted

docker-entrypoint.sh

@@ -103,12 +103,11 @@ else
   echoerr wait-for-db: timeout out after 15 seconds waiting for ${DB_HOST_NAME}:${DB_PORT}
 fi
 
-cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force
 
 
 echo "Setting folder permissions for uploads"
-chown -R www-data:www-data /var/www/BookStack/public/uploads && chmod -R 775 /var/www/BookStack/public/uploads
-chown -R www-data:www-data /var/www/BookStack/storage/uploads && chmod -R 775 /var/www/BookStack/storage/uploads
+chown -R www-data:www-data public/uploads && chmod -R 775 public/uploads
+chown -R www-data:www-data storage/uploads && chmod -R 775 storage/uploads
 
 echo "Clear Cache..."