From 04239702de584667a859359ebbb2b816dbfc353e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Nov 2016 08:28:52 +0100 Subject: [PATCH 1/3] Set Port in DB_HOST Signed-off-by: solidnerd --- README.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b4b30820..286406ec 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,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/docker-compose.yml b/docker-compose.yml index 71fac250..7298cf7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: depends_on: - mysql environment: - - DB_HOST=mysql + - DB_HOST=mysql:3306 - DB_DATABASE=bookstack - DB_USERNAME=bookstack - DB_PASSWORD=secret From b9ff3812c8f2fae43e3d277ac301f4d05e8fe506 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Nov 2016 08:29:08 +0100 Subject: [PATCH 2/3] update to 0.12.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- README.md | 4 ++-- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 286406ec..c4622f20 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # 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) ## Quickstart With Docker Compose is a Quickstart very easy. Run the following command: @@ -28,7 +28,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+ 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 7298cf7e..0ff97ac4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - ./mysql:/var/lib/mysql bookstack: - image: solidnerd/bookstack:0.12.1 + image: solidnerd/bookstack:0.12.2 depends_on: - mysql environment: From 85db72d7af334d462c5b857e1e9345c9ea7bd47a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Nov 2016 09:05:26 +0100 Subject: [PATCH 3/3] Add Hint for the removed --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c4622f20..0d394da4 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ ## 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: