Skip to content

Commit 4cd1867

Browse files
authored
Merge pull request #13 from ssddanbrown/master
Updated for release v0.13.1
2 parents 20b631b + b35119f commit 4cd1867

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM php:7.0-apache
22

33
ENV BOOKSTACK=BookStack \
4-
BOOKSTACK_VERSION=0.13.0
4+
BOOKSTACK_VERSION=0.13.1
55

66
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 \
77
&& docker-php-ext-install pdo pdo_mysql mbstring zip tidy \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)
44

5-
## Current Version: [0.13.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile)
5+
## Current Version: [0.13.1](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,7 +31,7 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret
3131
```
3232
2. BookStack Container:
3333
```
34-
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.13.0
34+
docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.13.1
3535
```
3636

3737
### Docker 1.9+
@@ -57,7 +57,7 @@ docker run -d --net bookstack_nw \
5757
-e DB_USERNAME=bookstack \
5858
-e DB_PASSWORD=secret \
5959
-p 8080:80
60-
solidnerd/bookstack:0.13.0
60+
solidnerd/bookstack:0.13.1
6161
```
6262

6363
After the steps you can visit [http://localhost:8080](http://localhost:8080) .

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.13.0
1+
0.13.1

docker-compose.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- ./mysql:/var/lib/mysql
1313

1414
bookstack:
15-
image: solidnerd/bookstack:0.13.0
15+
image: solidnerd/bookstack:0.13.1
1616
depends_on:
1717
- mysql
1818
environment:
@@ -22,5 +22,6 @@ services:
2222
- DB_PASSWORD=secret
2323
volumes:
2424
- ./uploads:/var/www/BookStack/public/uploads
25+
- ./storage-uploads:/var/www/BookStack/storage/uploads
2526
ports:
2627
- "8080:80"

docker-entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ fi
105105
cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force
106106

107107

108-
echo "Setting setting rights for uploads"
108+
echo "Setting folder permissions for uploads"
109109
chown -R www-data:www-data /var/www/BookStack/public/uploads && chmod -R 775 /var/www/BookStack/public/uploads
110+
chown -R www-data:www-data /var/www/BookStack/storage/uploads && chmod -R 775 /var/www/BookStack/storage/uploads
110111

111112
echo "Clear Cache..."
112113

0 commit comments

Comments
 (0)