From 12fa7dbcfb874732f6235a994c747b2fc6e73fae Mon Sep 17 00:00:00 2001
From: Philipp Schmitt <philipp@schmitt.co>
Date: Mon, 11 Sep 2017 08:19:48 +0200
Subject: [PATCH] Update bookstack to 0.18.0

---
 Dockerfile         |  2 +-
 README.md          | 19 +++++++------------
 VERSION            |  2 +-
 docker-compose.yml |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47a5923b..1a22ff01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.0-apache
 
 ENV BOOKSTACK=BookStack \
-    BOOKSTACK_VERSION=0.17.3 \
+    BOOKSTACK_VERSION=0.18.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 \
diff --git a/README.md b/README.md
index d2387215..9095d1dd 100644
--- a/README.md
+++ b/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.17.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
+## Current Version: [0.18.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,18 +31,15 @@ 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.17.3
+docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.18.0
 ```
 
-#### Docker 1.9+
-
-1.Create a shared network:
-
+### #Docker 1.9+
+1. Create a shared network:
 ```bash
 docker network create bookstack_nw`
 ```
-
-2.MySQL container :
+2.  MySQL container :
 ```bash
 docker run -d --net bookstack_nw  \
 -e MYSQL_ROOT_PASSWORD=secret \
@@ -53,9 +50,7 @@ docker run -d --net bookstack_nw  \
  mysql
 ```
 
-
-3.Create BookStack Container
-
+3. Create BookStack Container
 ```bash
 docker run -d --net bookstack_nw  \
 -e DB_HOST=bookstack_db:3306 \
@@ -63,7 +58,7 @@ docker run -d --net bookstack_nw  \
 -e DB_USERNAME=bookstack \
 -e DB_PASSWORD=secret \
 -p 8080:80 \
- solidnerd/bookstack:0.17.3
+ solidnerd/bookstack:0.18.0
 ```
 
 After the steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username 'admin@admin.com' and password 'password'.
diff --git a/VERSION b/VERSION
index 884e9604..66333910 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.17.3
+0.18.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c9ae7f4..32119edc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:0.17.3
+    image: solidnerd/bookstack:0.18.0
     depends_on:
     - mysql
     environment: