Merge pull request #25 from solidnerd/upgrade-to-0.15.0

Upgrade to 0.15.0

Author: solidnerd

Dockerfile

@@ -1,7 +1,8 @@
 FROM php:7.0-apache
 
 ENV BOOKSTACK=BookStack \
-    BOOKSTACK_VERSION=0.14.3
+    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,20 +13,24 @@ 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/* /tmp/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
+   && rm -rf /var/lib/apt/lists/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
 
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
 RUN a2enmod rewrite
 
 COPY docker-entrypoint.sh /
 
+WORKDIR $BOOKSTACK_HOME
+
 EXPOSE 80
 
+VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/public/storage"]
+
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 ARG BUILD_DATE
@@ -34,7 +39,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.docker.dockerfile="/Dockerfile" \
       org.label-schema.license="MIT" \
       org.label-schema.name="bookstack" \
+      org.label-schema.vendor="solidnerd" \
       org.label-schema.url="https://github.com/solidnerd/docker-bookstack/" \
       org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vcs-url="https://github.com/solidnerd/docker-bookstack.git" \
-      org.label-schema.vcs-type="Git"
+      org.label-schema.vcs-type="Git"

README.md

@@ -2,7 +2,7 @@
 
 [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com")
 
-## Current Version: [0.14.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
+## Current Version: [0.15.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
 
 ### Changes
 In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306`
@@ -31,7 +31,7 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret
 ```
 2. BookStack Container:
 ```bash
-docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.14.3
+docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.15.0
 ```
 
 ### #Docker 1.9+
@@ -58,7 +58,7 @@ docker run -d --net bookstack_nw  \
 -e DB_USERNAME=bookstack \
 -e DB_PASSWORD=secret \
 -p 8080:80 \
- solidnerd/bookstack:0.14.3
+ solidnerd/bookstack:0.15.0
 ```
 
 After the steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username '[email protected]' and password 'password'.

VERSION

@@ -1 +1 @@
-0.14.3
+0.15.0

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-compose.yml

@@ -12,7 +12,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:0.14.3
+    image: solidnerd/bookstack:0.15.0
     depends_on:
     - mysql
     environment:
@@ -29,4 +29,4 @@ services:
 volumes:
  mysql-data:
  uploads:
- storage-uploads:
+ storage-uploads:

docker-entrypoint.sh

@@ -79,6 +79,7 @@ if [ ! -f '/var/www/BookStack/.env' ]; then
       MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null}
       # URL used for social login redirects, NO TRAILING SLASH
 EOF
+sed -ie "s/single/errorlog/g" config/app.php
     else
         echo >&2 'error: missing DB_HOST environment variable'
         exit 1
@@ -102,16 +103,19 @@ 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
+composer install 
 
+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
 
-echo "Clear Cache..."
+echo "Setting folder permissions for 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
 
 php artisan cache:clear
+
 php artisan view:clear
 
 exec apache2-foreground

hooks/post_push

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+docker tag $IMAGE_NAME $DOCKER_REPO:latest
+docker push $DOCKER_REPO:latest