Commit b35119f

committed

Updated for release v0.13.1

Also added additional volume to compose for attachments. Also modified entrypoint script to take attachments into account.

1 parent 20b631b commit b35119fCopy full SHA for b35119f

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`FROM php:7.0-apache`
`2`	`2`
`3`	`3`	`ENV BOOKSTACK=BookStack \`
`4`		`- BOOKSTACK_VERSION=0.13.0`
	`4`	`+ BOOKSTACK_VERSION=0.13.1`
`5`	`5`
`6`	`6`	`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`	`7`	`&& docker-php-ext-install pdo pdo_mysql mbstring zip tidy \`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`# Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack)`
`4`	`4`
`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)`
`6`	`6`
`7`	`7`	`### Changes`
`8`	`8`	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`
`31`	`31`	```
`32`	`32`	`2. BookStack Container:`
`33`	`33`	```
`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`
`35`	`35`	```
`36`	`36`
`37`	`37`	`### Docker 1.9+`
`@@ -57,7 +57,7 @@ docker run -d --net bookstack_nw \`
`57`	`57`	`-e DB_USERNAME=bookstack \`
`58`	`58`	`-e DB_PASSWORD=secret \`
`59`	`59`	`-p 8080:80`
`60`		`- solidnerd/bookstack:0.13.0`
	`60`	`+ solidnerd/bookstack:0.13.1`
`61`	`61`	```
`62`	`62`
`63`	`63`	`After the steps you can visit [http://localhost:8080](http://localhost:8080) .`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ services:`
`12`	`12`	`- ./mysql:/var/lib/mysql`
`13`	`13`
`14`	`14`	`bookstack:`
`15`		`- image: solidnerd/bookstack:0.13.0`
	`15`	`+ image: solidnerd/bookstack:0.13.1`
`16`	`16`	`depends_on:`
`17`	`17`	`- mysql`
`18`	`18`	`environment:`
`@@ -22,5 +22,6 @@ services:`
`22`	`22`	`- DB_PASSWORD=secret`
`23`	`23`	`volumes:`
`24`	`24`	`- ./uploads:/var/www/BookStack/public/uploads`
	`25`	`+ - ./storage-uploads:/var/www/BookStack/storage/uploads`
`25`	`26`	`ports:`
`26`	`27`	`- "8080:80"`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,9 @@ fi`
`105`	`105`	`cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force`
`106`	`106`
`107`	`107`
`108`		`-echo "Setting setting rights for uploads"`
	`108`	`+echo "Setting folder permissions for uploads"`
`109`	`109`	`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`
`110`	`111`
`111`	`112`	`echo "Clear Cache..."`
`112`	`113`

Comments

(0)