From 13fed69f830377f593a2304e6440d98236b5d4c4 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Tue, 29 May 2018 15:56:41 +0200 Subject: [PATCH 1/2] Update Booktstack to 0.22.0 --- Dockerfile | 2 +- README.md | 6 +++--- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d3a2c9c..466f2d28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.1-apache ENV BOOKSTACK=BookStack \ - BOOKSTACK_VERSION=0.21.0 \ + BOOKSTACK_VERSION=0.22.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 fa36d97c..908b21c4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](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.21.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [0.22.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.21.0 +docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.22.0 ``` #### Docker 1.9+ @@ -63,7 +63,7 @@ docker run -d --net bookstack_nw \ -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ -p 8080:80 \ - solidnerd/bookstack:0.21.0 + solidnerd/bookstack:0.22.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 88541566..21574090 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.21.0 +0.22.0 diff --git a/docker-compose.yml b/docker-compose.yml index e7f42135..2ae24e74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:0.21.0 + image: solidnerd/bookstack:0.22.0 depends_on: - mysql environment: From 4d28d220ef708c2b5ca34ebcb8fd60aea1ce3761 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Wed, 30 May 2018 07:42:42 +0200 Subject: [PATCH 2/2] Replace libpng12-dev with libpng-dev libpng12-dev has been dropped in 18.04 See: - https://askubuntu.com/questions/991706/e-package-libpng12-dev-has-no-installation-candidate - https://askubuntu.com/questions/840257/e-package-libpng12-0-has-no-installation-candidate-ubuntu-16-10-gnome/840268 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 466f2d28..48f9c75a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV BOOKSTACK=BookStack \ BOOKSTACK_VERSION=0.22.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 \ +RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev \ && docker-php-ext-install pdo pdo_mysql mbstring zip tidy \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ && docker-php-ext-install ldap \