diff --git a/Dockerfile b/Dockerfile index 53a011ec..a6512bb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.0-apache ENV BOOKSTACK=BookStack \ - BOOKSTACK_VERSION=0.12.1 + BOOKSTACK_VERSION=0.12.2 RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget libldap2-dev \ && docker-php-ext-install pdo pdo_mysql mbstring zip \ diff --git a/README.md b/README.md index b4b30820..0d394da4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ # Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack) -## Current Version: [0.12.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [0.12.2](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` ## Quickstart With Docker Compose is a Quickstart very easy. Run the following command: @@ -28,7 +31,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.12.1 +docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.12.2 ``` ### Docker 1.9+ @@ -49,7 +52,7 @@ docker run -d --net bookstack_nw \ 3. Create BookStack Container ``` docker run -d --net bookstack_nw \ --e DB_HOST=bookstack_db \ +-e DB_HOST=bookstack_db:3306 \ -e DB_DATABASE=bookstack \ -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ diff --git a/VERSION b/VERSION index 34a83616..26acbf08 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.12.1 +0.12.2 diff --git a/docker-compose.yml b/docker-compose.yml index 71fac250..0ff97ac4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,11 +12,11 @@ services: - ./mysql:/var/lib/mysql bookstack: - image: solidnerd/bookstack:0.12.1 + image: solidnerd/bookstack:0.12.2 depends_on: - mysql environment: - - DB_HOST=mysql + - DB_HOST=mysql:3306 - DB_DATABASE=bookstack - DB_USERNAME=bookstack - DB_PASSWORD=secret