From 84a83130c4defa321a7ec28a94d312723a537e4c Mon Sep 17 00:00:00 2001
From: Aditya Nath <928.aditya@gmail.com>
Date: Tue, 3 Dec 2019 20:10:46 -0500
Subject: [PATCH 1/2] Updated the apache version by making stretch to buster

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

diff --git a/Dockerfile b/Dockerfile
index ffb502ae..6d4f9289 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
 
 ENV BOOKSTACK=BookStack \
     BOOKSTACK_VERSION=0.27.5 \
     BOOKSTACK_HOME="/var/www/bookstack"
 
-RUN apt-get update && apt-get install -y --no-install-recommends git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev libxml2-dev fontconfig ttf-freefont wkhtmltopdf tar curl \
+RUN apt-get update && apt-get install -y --no-install-recommends git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng-dev wget libldap2-dev libtidy-dev libxml2-dev fontconfig wkhtmltopdf tar curl \
    && docker-php-ext-install dom pdo pdo_mysql zip tidy  \
    && docker-php-ext-configure ldap \
    && docker-php-ext-install ldap \
diff --git a/docker-compose.yml b/docker-compose.yml
index 33f2d0be..2b4cd5cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:0.27.5
+    build: .
     depends_on:
     - mysql
     environment:

From 8537642b1d6542009bda2912bc6da7c2acf3db88 Mon Sep 17 00:00:00 2001
From: Aditya Nath <928.aditya@gmail.com>
Date: Fri, 6 Dec 2019 15:00:02 -0500
Subject: [PATCH 2/2] Update docker-compose.yml

adding app-url for bookstack docker.
---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2b4cd5cf..0ab0b2b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     - MYSQL_DATABASE=bookstack
     - MYSQL_USER=bookstack
     - MYSQL_PASSWORD=secret
+    - APP_URL=https://wiki.michiana-infosec.com
     volumes:
     - mysql-data:/var/lib/mysql