From f59fbb42acf7c7e7a38f563c62577d044ced6542 Mon Sep 17 00:00:00 2001
From: Felix Delattre <github@xama.nu>
Date: Fri, 27 Jul 2018 18:50:02 +0200
Subject: [PATCH] Rely on debian-stretch image

---
 Dockerfile                            | 37 ++++++++++++++++++---------
 files/{pelican => }/requirements.txt  |  0
 files/{develop_server.sh => start.sh} |  0
 3 files changed, 25 insertions(+), 12 deletions(-)
 rename files/{pelican => }/requirements.txt (100%)
 rename files/{develop_server.sh => start.sh} (100%)
 mode change 100644 => 100755

diff --git a/Dockerfile b/Dockerfile
index db28928..5466d5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,29 @@
-FROM python:2
+FROM debian:stretch-slim
 
-ENV SRV_DIR=//srv
-ENV WORKING_DIR=//srv/pelican
-ENV PORT=8000
-
-ADD ./files $SRV_DIR
-WORKDIR $WORKING_DIR
-RUN mkdir output content cache
-VOLUME ["$WORKING_DIR/"]
+# Install dependencies
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update --yes --fix-missing && apt-get upgrade --yes && \
+    apt-get install --yes --no-install-recommends \
+        apt-utils \
+        bash \
+        coreutils \
+        python-pip \
+        python-virtualenv \
+        python-dev \
+        python-setuptools
 
+# Install pelican and dependencies
+COPY files/start.sh /start.sh
+COPY files/requirements.txt requirements.txt
+RUN pip install wheel
 RUN pip install -r requirements.txt
-RUN chmod +x $SRV_DIR/develop_server.sh
 
-EXPOSE $PORT
-CMD $SRV_DIR/develop_server.sh restart $PORT
+# Cleanup
+RUN apt-get autoremove --yes $build_dependencies && apt-get autoremove --yes && \
+    apt-get clean --yes && rm -rf /var/lib/apt/* /var/cache/apt/* /root/.cache
+
+EXPOSE 8000
+WORKDIR /srv/pelican
+VOLUME ["/srv/pelican"]
+CMD /start.sh restart 8000
+
diff --git a/files/pelican/requirements.txt b/files/requirements.txt
similarity index 100%
rename from files/pelican/requirements.txt
rename to files/requirements.txt
diff --git a/files/develop_server.sh b/files/start.sh
old mode 100644
new mode 100755
similarity index 100%
rename from files/develop_server.sh
rename to files/start.sh