Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Merging 0.24.2 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Dec 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
13fed69
Update Booktstack to 0.22.0
pschmitt May 29, 2018
4d28d22
Replace libpng12-dev with libpng-dev
pschmitt May 30, 2018
5ac085a
Merge pull request #86 from pschmitt/v0.22.0
solidnerd Jun 5, 2018
173dd5c
Set baseimage to php:7.1-apache-stretch
solidnerd Jun 5, 2018
6d1d9c3
Merge pull request #88 from solidnerd/feature-set-baseimage-explicit
solidnerd Jun 5, 2018
306c51d
Upgrade Bookstack to 0.23.0
solidnerd Jul 31, 2018
0d6370c
Merge pull request #95 from solidnerd/upgrade-to-0.23.0
solidnerd Jul 31, 2018
cc8ddfe
Upgrade Bookstack to 0.23.1
solidnerd Aug 15, 2018
cd69df4
Merge pull request #97 from solidnerd/upgrade-to-0.23.1
solidnerd Aug 15, 2018
2630a96
Upgrade Bookstack to 0.23.2
solidnerd Aug 20, 2018
bb192ca
Merge pull request #98 from solidnerd/upgrade-to-0.23.2
solidnerd Aug 20, 2018
0dabc97
Upgrade Bookstack to 0.24.0
solidnerd Oct 3, 2018
de519b2
Merge pull request #102 from solidnerd/upgrade-to-0.24.0
solidnerd Oct 3, 2018
7123fab
Update BookStack to 0.24.1
pschmitt Sep 25, 2018
1bfa3a9
Merge pull request #99 from pschmitt/v0.24.1
solidnerd Oct 3, 2018
5d81b63
Small READMY fix
mtib Oct 25, 2018
b9c8ac1
Merge pull request #103 from mtib/patch-1
solidnerd Oct 25, 2018
b29e419
replace BookStack repo URL with new version
christophert Oct 30, 2018
957984b
Merge pull request #104 from christophert/master
solidnerd Oct 30, 2018
0d57847
Upgrade Bookstack to 0.24.2
solidnerd Nov 17, 2018
2ccba9a
Merge pull request #106 from solidnerd/upgrade-to-0.24.2
solidnerd Nov 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 8 Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM php:7.1-apache
FROM php:7.1-apache-stretch

ENV BOOKSTACK=BookStack \
BOOKSTACK_VERSION=0.21.0 \
BOOKSTACK_VERSION=0.24.2 \
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 \
&& docker-php-ext-configure gd --with-freetype-dir=usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install gd \
&& cd /var/www && curl -sS https://getcomposer.org/installer | php \
&& mv /var/www/composer.phar /usr/local/bin/composer \
&& wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
&& wget https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
&& tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz \
&& cd $BOOKSTACK_HOME && composer install \
&& chown -R www-data:www-data $BOOKSTACK_HOME \
Expand Down
8 changes: 4 additions & 4 deletions 8 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.21.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
## Current Version: [0.24.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`
Expand Down Expand Up @@ -31,15 +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.21.0
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.24.2
```

#### Docker 1.9+

1.Create a shared network:

```bash
docker network create bookstack_nw`
docker network create bookstack_nw
```

2.MySQL container :
Expand All @@ -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.24.2
```

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

bookstack:
image: solidnerd/bookstack:0.21.0
image: solidnerd/bookstack:0.24.2
depends_on:
- mysql
environment:
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.