From 55a96e15d0446a295e14b50403cb36ada00ebe27 Mon Sep 17 00:00:00 2001
From: Anton Tuchkov <17809291+Technik-J@users.noreply.github.com>
Date: Sat, 18 May 2019 18:01:02 +0500
Subject: [PATCH 1/3] BookStack update to 0.26.1.

---
 Dockerfile         | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0fc910da..22db7128 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.1-apache-stretch
 
 ENV BOOKSTACK=BookStack \
-    BOOKSTACK_VERSION=0.25.2 \
+    BOOKSTACK_VERSION=0.26.1 \
     BOOKSTACK_HOME="/var/www/bookstack"
 
 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 \
diff --git a/docker-compose.yml b/docker-compose.yml
index 13da2879..163d0737 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:0.25.2
+    image: solidnerd/bookstack:0.26.1
     depends_on:
     - mysql
     environment:

From aa5185699a35df31a08346d71b7cb40959d5dfa5 Mon Sep 17 00:00:00 2001
From: Anton Tuchkov <17809291+Technik-J@users.noreply.github.com>
Date: Sat, 18 May 2019 18:02:54 +0500
Subject: [PATCH 2/3] Fix storage path for uploaded files.

---
 Dockerfile         | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 22db7128..4f3767a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,7 @@ WORKDIR $BOOKSTACK_HOME
 
 EXPOSE 80
 
-VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/public/storage"]
+VOLUME ["$BOOKSTACK_HOME/public/uploads","$BOOKSTACK_HOME/storage/uploads"]
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 163d0737..7cf5cfb7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     - DB_PASSWORD=secret
     volumes:
     - uploads:/var/www/bookstack/public/uploads
-    - storage-uploads:/var/www/bookstack/public/storage
+    - storage-uploads:/var/www/bookstack/storage/uploads
     ports:
     - "8080:80"
 

From 864f4e61308284301a9f20fcd941c21f8de69c68 Mon Sep 17 00:00:00 2001
From: Anton Tuchkov <17809291+Technik-J@users.noreply.github.com>
Date: Sun, 19 May 2019 11:11:05 +0500
Subject: [PATCH 3/3] Added language variables and moved php.ini configuration
 to compose file as environment variable.

---
 Dockerfile           |  2 +-
 docker-entrypoint.sh | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f3767a0..61f8d8b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /var/tmp/* /etc/apache2/sites-enabled/000-*.conf
 
-COPY php.ini /usr/local/etc/php/php.ini
+
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
 RUN a2enmod rewrite
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ce378cd3..b4324552 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -78,6 +78,10 @@ if [ ! -f "$BOOKSTACK_HOME/.env" ]; then
       MAIL_PASSWORD=${MAIL_PASSWORD:-null}
       MAIL_ENCRYPTION=${MAIL_ENCRYPTION:-null}
       # URL used for social login redirects, NO TRAILING SLASH
+
+      # Language Configuration
+      APP_LANG=${APP_LANG:-en}
+      APP_AUTO_LANG_PUBLIC=${APP_AUTO_LANG_PUBLIC:-true}
 EOF
 sed -ie "s/single/errorlog/g" config/app.php
     else
@@ -86,6 +90,15 @@ sed -ie "s/single/errorlog/g" config/app.php
     fi
 fi
 
+if [ ! -f "/usr/local/etc/php/php.ini" ]; then
+  cat > "/usr/local/etc/php/php.ini" <<EOF
+[PHP]
+
+post_max_size = ${post_max_size:-10M}
+upload_max_filesize = ${upload_max_filesize:-10M}
+EOF
+fi
+
 echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}"
 
 timeout 15 bash <<EOT
@@ -118,4 +131,4 @@ php artisan cache:clear
 
 php artisan view:clear
 
-exec apache2-foreground
+exec apache2-foreground
\ No newline at end of file