Merge "Improve support for environment variables in Dockerfile"
diff --git a/Dockerfile b/Dockerfile
index 8f0b444..2a877b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,11 +62,15 @@
 
 USER kalamar
 
-EXPOSE 64543
+ENV MOJO_PORT   64543
+ENV MOJO_LISTEN http://*:${MOJO_PORT}
+ENV MOJO_MODE   production
+
+EXPOSE ${MOJO_PORT}
 
 ENTRYPOINT [ "perl", "script/kalamar" ]
 
-CMD [ "daemon", "-m", "production", "-l", "http://*:64543" ]
+CMD [ "daemon" ]
 
 LABEL author="korap@ids-mannheim.de"
 LABEL description="Docker Image for Kalamar, the KorAP user frontend"