Merge pull request #1 from ssddanbrown/master

Updated to BookStack v0.11.1 & php7

Author: solidnerd

Dockerfile

@@ -1,7 +1,7 @@
-FROM php:5.6-apache
+FROM php:7.0-apache
 
 ENV BOOKSTACK BookStack
-ENV BOOKSTACK_VERSION 0.11.0
+ENV BOOKSTACK_VERSION 0.11.1
 
 RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget \
    && docker-php-ext-install pdo pdo_mysql mbstring zip \
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
    && chown -R www-data:www-data /var/www/BookStack \
    && apt-get -y autoremove \
    && apt-get clean \
-   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
 
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
 RUN a2enmod rewrite

README.md

@@ -2,7 +2,7 @@
 
 # Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)
 
-## Current Version: [0.11.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
+## Current Version: [0.11.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
 
 ## Quickstart
 With Docker Compose is a Quickstart very easy. Run the following command:
@@ -24,7 +24,7 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret
 ```
 2. BookStack Container:
 ```
-docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.9.3
+docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.11.1
 ```
 
 ### Docker 1.9+

VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     - ./mysql:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:0.11.0
+    image: solidnerd/bookstack:0.11.1
     depends_on:
     - mysql
     environment: