diff --git a/app/Dockerfile b/app/Dockerfile index 14457bd..4f9b2e1 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="JJTC " ENV PPM_VERSION=2.0.0 \ PPM_HTTP_VERSION=2.0.1 \ BOOKSTACK=BookStack \ - BOOKSTACK_VERSION=0.26.2 \ + BOOKSTACK_VERSION=0.26.3 \ BOOKSTACK_HOME="/app" COPY docker-entrypoint.sh /app/docker-entrypoint.sh @@ -73,7 +73,7 @@ RUN set -ex \ && echo "Changing ownership:" \ && chown -R www-data:www-data . \ && echo "Ensure Nginx got access to tmp folder:" \ - && chown www-data:root -R /var/tmp/nginx/ + && chown www-data:root -R /var/lib/nginx/tmp WORKDIR $BOOKSTACK_HOME diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh index fe738f6..f04c130 100644 --- a/app/docker-entrypoint.sh +++ b/app/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -ex php artisan key:generate --no-interaction --force diff --git a/docker-compose.yml b/docker-compose.yml index 458fddd..e60a7c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,11 +23,9 @@ services: - cache:/data/ networks: - backend - labels: - - "traefik.enable=false" app: - image: jjtc/bookstack-ppm:0.26.2-r0 + image: jjtc/bookstack-ppm:0.26.3-r0 build: ./app/ restart: unless-stopped depends_on: @@ -35,7 +33,7 @@ services: - cache volumes: - .env:/app/.env:rw - - ./app/php.ini:/usr/local/etc/php/conf.d/php.ini + - ./app/php.ini:/etc/php7/php.ini - ./app/nginx.conf:/etc/nginx/nginx.conf:ro - ./app/default.conf:/etc/nginx/sites-enabled/default:ro - uploads:/app/public/uploads:rw