diff --git a/Dockerfile b/Dockerfile index 680f7820..7c21646a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM php:7.0-apache ENV BOOKSTACK=BookStack \ - BOOKSTACK_VERSION=0.13.0 + BOOKSTACK_VERSION=0.13.1 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 \ && docker-php-ext-install pdo pdo_mysql mbstring zip tidy \ diff --git a/README.md b/README.md index 221caf1b..437f5c00 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack) -## Current Version: [0.13.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [0.13.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` @@ -31,7 +31,7 @@ docker run -d --name bookstack-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret ``` 2. BookStack Container: ``` -docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.13.0 +docker run --name my-bookstack -d --link bookstack-mysql:mysql -p 8080:80 solidnerd/bookstack:0.13.1 ``` ### Docker 1.9+ @@ -57,7 +57,7 @@ docker run -d --net bookstack_nw \ -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ -p 8080:80 - solidnerd/bookstack:0.13.0 + solidnerd/bookstack:0.13.1 ``` After the steps you can visit [http://localhost:8080](http://localhost:8080) . diff --git a/VERSION b/VERSION index 54d1a4f2..ed0d9e99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.13.0 +0.13.1 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index aac4f539..822d12f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - ./mysql:/var/lib/mysql bookstack: - image: solidnerd/bookstack:0.13.0 + image: solidnerd/bookstack:0.13.1 depends_on: - mysql environment: @@ -22,5 +22,6 @@ services: - DB_PASSWORD=secret volumes: - ./uploads:/var/www/BookStack/public/uploads + - ./storage-uploads:/var/www/BookStack/storage/uploads ports: - "8080:80" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 4e57f49c..7c4a2c29 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -105,8 +105,9 @@ fi cd /var/www/BookStack/ && php artisan key:generate && php artisan migrate --force -echo "Setting setting rights for uploads" +echo "Setting folder permissions for uploads" chown -R www-data:www-data /var/www/BookStack/public/uploads && chmod -R 775 /var/www/BookStack/public/uploads +chown -R www-data:www-data /var/www/BookStack/storage/uploads && chmod -R 775 /var/www/BookStack/storage/uploads echo "Clear Cache..."