From 5926c6f24ca128b87462e9f597853347b4d5170f Mon Sep 17 00:00:00 2001
From: Christian Wittwer <wittwerch@gmail.com>
Date: Wed, 7 Sep 2016 07:31:36 +0000
Subject: [PATCH] Make BookStack the default virtualhost

---
 Dockerfile     | 5 ++++-
 bookstack.conf | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c78885d..7d78823 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM php:5.6-apache
 MAINTAINER kilhog@protonmail.com
 
 ENV BOOKSTACK BookStack
-ENV BOOKSTACK_VERSION 0.9.2
+ENV BOOKSTACK_VERSION 0.12.1
 
 RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev wget \
    && docker-php-ext-install pdo pdo_mysql mbstring zip \
@@ -18,11 +18,14 @@ RUN apt-get update && apt-get install -y git zlib1g-dev libfreetype6-dev libjpeg
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN rm -f /etc/apache2/sites-enabled/000-default.conf
 COPY bookstack.conf /etc/apache2/sites-enabled/bookstack.conf
 RUN a2enmod rewrite
 
 COPY docker-entrypoint.sh /
 
+VOLUME ["/var/www/BookStack/public/uploads"]
+
 EXPOSE 80
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/bookstack.conf b/bookstack.conf
index f7245b9..9ce234b 100644
--- a/bookstack.conf
+++ b/bookstack.conf
@@ -1,5 +1,4 @@
 <VirtualHost *:80>
-    ServerName bookstack.dev
     DocumentRoot "/var/www/BookStack/public/"
 
     <Directory "/var/www/BookStack/">