From 84d7f9a2540c9a5bdb69723e7b016ef8be075071 Mon Sep 17 00:00:00 2001
From: Cabillot Julien <jcabillot@gmail.com>
Date: Fri, 18 May 2018 11:38:54 -0400
Subject: [PATCH] 17.10 -> 18.04, uniformisation avec les autres dockers ubuntu

---
 Dockerfile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e436be4..ade26ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,15 @@
-FROM "ubuntu:17.10"
+FROM "ubuntu:18.04"
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
-RUN apt-get -qq update && \
-    apt-get -qq --yes install git-core python bsdmainutils curl python-six && \
-    git clone https://github.com/jvehent/cipherscan.git && \
+
+RUN export DEBIAN_FRONTEND="noninteractive" && \
+    export BUILD_PACKAGES="git-core" && \
+    export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \
+    apt-get -qq update && \
+    apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \
+    git clone "https://github.com/jvehent/cipherscan.git" && \
     /cipherscan/cscan.sh -l && \
-    apt-get -qq --yes remove --purge git-core && \
+    apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
     apt-get -qq --yes autoremove --purge && \
     apt-get -qq --yes clean all && \
     rm -rf "/usr/share/doc/"* \
@@ -18,7 +22,7 @@ RUN apt-get -qq update && \
            "/tmp/"*
 
 
-WORKDIR /cipherscan
+WORKDIR "/cipherscan"
 
 ENTRYPOINT ["/cipherscan/cipherscan"]
 CMD ["--help"]