From 8d6a94fbbb6b6e64804846e1409cea6d0b737f3a Mon Sep 17 00:00:00 2001
From: Theodotos Andreou <theo@ubuntucy.org>
Date: Thu, 22 Sep 2016 23:04:50 +0300
Subject: [PATCH] Change to jebian jessie

---
 docker/Dockerfile | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fa3bec0..b43fefd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,23 +5,35 @@ FROM debian:jessie
 
 MAINTAINER Theodotos Andreou theodotos.andreou@puri.sm
 
-
-RUN apt-get update
-RUN apt-get -y dist-upgrade
-RUN    apt-get install -y software-properties-common python-software-properties python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libyaml-dev libssl-dev libsasl2-dev libldap2-dev npm git python-virtualenv && \
+RUN apt-get update && \
+    apt-get -q -y dist-upgrade && \
+    apt-get install -q -y --no-install-recommends && \
+    software-properties-common \
+    python-software-properties \
+    python-pip python-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    zlib1g-dev \
+    libffi-dev \
+    libyaml-dev \
+    libssl-dev \
+    libsasl2-dev \
+    libldap2-dev \
+    npm git \
+    python-virtualenv && \
     apt-get clean  && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN ln -s /usr/bin/nodejs /usr/bin/node && \
     npm install -g bower clean-css
 
-RUN useradd -m -d /var/lib/realms -s /bin/bash wiki
+RUN useradd -ms /bin/bash wiki
 
 USER wiki
 
-RUN git clone https://github.com/scragg0x/realms-wiki /var/lib/realms/realms-wiki
+RUN git clone https://github.com/scragg0x/realms-wiki /home/wiki/realms-wiki
 
-WORKDIR /var/lib/realms/realms-wiki
+WORKDIR /home/wiki/realms-wiki
 
 RUN virtualenv .venv && \
     . .venv/bin/activate && \
@@ -33,11 +45,11 @@ ENV WORKERS=3
 ENV GEVENT_RESOLVER=ares
 
 ENV REALMS_ENV=docker
-ENV REALMS_WIKI_PATH=/var/lib/realms/data/repo
-ENV REALMS_DB_URI='sqlite:////var/lib/realms/data/wiki.db'
+ENV REALMS_WIKI_PATH=/home/wiki/data/repo
+ENV REALMS_DB_URI='sqlite:////home/wiki/data/wiki.db'
 
-RUN mkdir /var/lib/realms/data && touch /var/lib/realms/data/.a
-VOLUME /var/lib/realms/data
+RUN mkdir /home/wiki/data && touch /home/wiki/data/.a
+VOLUME /home/wiki/data
 
 EXPOSE 5000
 
@@ -49,5 +61,5 @@ CMD . .venv/bin/activate && \
         --worker-class gevent \
         --workers ${WORKERS} \
         --bind 0.0.0.0:5000 \
-        --chdir /var/lib/realms/realms-wiki \
+        --chdir /home/wiki/realms-wiki \
         'realms:create_app()'