Skip to content

Commit

Permalink
Merge pull request #71 from solidnerd/upgrade-to-0.20.1
Browse files Browse the repository at this point in the history
Upgrade Bookstack to 0.20.1
  • Loading branch information
solidnerd authored Mar 30, 2018
2 parents 8d8853c + cbdec85 commit 51b3549
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM php:7.1.10-apache
FROM php:7.1-apache

ENV BOOKSTACK=BookStack \
BOOKSTACK_VERSION=0.20.0 \
BOOKSTACK_VERSION=0.20.1 \
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 \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
## Current Version: [0.20.1](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`
Expand Down Expand Up @@ -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.20.0
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.20.1
```

#### Docker 1.9+
Expand Down Expand Up @@ -63,7 +63,7 @@ docker run -d --net bookstack_nw \
-e DB_USERNAME=bookstack \
-e DB_PASSWORD=secret \
-p 8080:80 \
solidnerd/bookstack:0.20.0
solidnerd/bookstack:0.20.1
```

After the steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username '[email protected]' and password 'password'.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.20.0
0.20.1
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- mysql-data:/var/lib/mysql

bookstack:
image: solidnerd/bookstack:0.20.0
image: solidnerd/bookstack:0.20.1
depends_on:
- mysql
environment:
Expand Down

0 comments on commit 51b3549

Please sign in to comment.