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

Commit ddd5e86

Browse filesBrowse files
etherfoundryetherfoundry
authored
Merge pull request #1 from solidnerd/master
Merging 0.24.2
2 parents dfa61b4 + 2ccba9a commit ddd5e86
Copy full SHA for ddd5e86

File tree

Expand file treeCollapse file tree

4 files changed

+10
-10
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+10
-10
lines changed

‎Dockerfile

Copy file name to clipboardExpand all lines: Dockerfile
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM php:7.1-apache
1+
FROM php:7.1-apache-stretch
22

33
ENV BOOKSTACK=BookStack \
4-
BOOKSTACK_VERSION=0.21.0 \
4+
BOOKSTACK_VERSION=0.24.2 \
55
BOOKSTACK_HOME="/var/www/bookstack"
66

7-
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 \
7+
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 \
88
&& docker-php-ext-install pdo pdo_mysql mbstring zip tidy \
99
&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
1010
&& docker-php-ext-install ldap \
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
1313
&& docker-php-ext-install opcache \
1414
&& cd /var/www && curl -sS https://getcomposer.org/installer | php \
1515
&& mv /var/www/composer.phar /usr/local/bin/composer \
16-
&& wget https://github.com/ssddanbrown/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
16+
&& wget https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz -O ${BOOKSTACK}.tar.gz \
1717
&& tar -xf ${BOOKSTACK}.tar.gz && mv BookStack-${BOOKSTACK_VERSION} ${BOOKSTACK_HOME} && rm ${BOOKSTACK}.tar.gz \
1818
&& cd $BOOKSTACK_HOME && composer install \
1919
&& chown -R www-data:www-data $BOOKSTACK_HOME \

‎README.md

Copy file name to clipboardExpand all lines: README.md
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![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")
44

5-
## Current Version: [0.21.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
5+
## Current Version: [0.24.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
66

77
### Changes
88
In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306`
@@ -31,15 +31,15 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret
3131
```
3232
2. BookStack Container:
3333
```bash
34-
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.21.0
34+
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.24.2
3535
```
3636

3737
#### Docker 1.9+
3838

3939
1.Create a shared network:
4040

4141
```bash
42-
docker network create bookstack_nw`
42+
docker network create bookstack_nw
4343
```
4444

4545
2.MySQL container :
@@ -63,7 +63,7 @@ docker run -d --net bookstack_nw \
6363
-e DB_USERNAME=bookstack \
6464
-e DB_PASSWORD=secret \
6565
-p 8080:80 \
66-
solidnerd/bookstack:0.21.0
66+
solidnerd/bookstack:0.24.2
6767
```
6868

6969
After the steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username 'admin@admin.com' and password 'password'.

‎VERSION

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.21.0
1+
0.24.2

‎docker-compose.yml

Copy file name to clipboardExpand all lines: docker-compose.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- mysql-data:/var/lib/mysql
1212

1313
bookstack:
14-
image: solidnerd/bookstack:0.21.0
14+
image: solidnerd/bookstack:0.24.2
1515
depends_on:
1616
- mysql
1717
environment:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.