From 0070bac7b1e066fdb6d0e6daa627aa9f2257a90b Mon Sep 17 00:00:00 2001
From: Mario Ban <mario.ban@bluewin.ch>
Date: Thu, 30 May 2019 11:41:31 +0200
Subject: [PATCH] Clean-up

---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 706ed5b..9de713c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,12 @@
 
 FROM haskell
 
-LABEL version="1.2.0"
+LABEL version="1.2.1"
 LABEL maintainer="Mario Ban <mario.ban@bluewin.ch>"
 
+ENV DEFAULT_UID 1000
+ENV DEFAULT_GID 1000
+
 # Install additional packages
 RUN apt-get update -y && \
     apt-get install -y -o Acquire::Retries=10 \
@@ -44,7 +47,7 @@ RUN cp /usr/share/zoneinfo/Europe/Zurich /etc/localtime
 #RUN texhash
 
 # Add user and group
-RUN groupadd --gid 1000 docker && useradd --uid 1000 --create-home --no-log-init -g docker -G sudo docker
+RUN groupadd --gid $DEFAULT_GID docker && useradd --uid $DEFAULT_UID --create-home --no-log-init -g docker -G sudo docker
 
 # No password for sudo
 RUN echo "docker ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/010_docker-nopasswd
@@ -60,7 +63,7 @@ RUN sed -i -e 's/#force_color_prompt=yes/force_color_prompt=yes/' -e 's/#alias l
 RUN cabal update && \
     cabal install pandoc
 
-ENV PATH="/home/docker/.cabal/bin:${PATH}"
+ENV PATH /home/docker/.cabal/bin:$PATH
 
 # Create and set working directory
 WORKDIR /data