# HG changeset patch
# User Dustin Demuth <dustin@intevation.de>
# Date 1450165849 -3600
# Node ID b892eb346f14f2de05bb0855718fc19f5cbc604c
# Parent  0ca27b76158467ff9a43ffaa3897d51c0a2d3d17# Parent  53954a9fd6e7e8559b0e5c242724ba16279ce3f3
Merged Dockerfile

diff -r 0ca27b761584 -r b892eb346f14 Dockerfile
--- a/Dockerfile	Tue Dec 15 08:50:10 2015 +0100
+++ b/Dockerfile	Tue Dec 15 08:50:49 2015 +0100
@@ -3,7 +3,7 @@
 #
 # Build with e.g. `docker build --force-rm=true -t koala/lada_client .'
 # Run from the repository root-dir with e.g.
-# `docker run --name lada_client -v $PWD:/usr/local/apache2/htdocs/
+# `docker run --name lada_client
 #             --link lada_wildfly:lada-server -p 8182:80 -d koala/lada_client'
 #
 # The linked container may be created from the Dockerfile in the lada-server
@@ -11,6 +11,9 @@
 #
 # The LADA-application will be available under http://yourdockerhost:8182
 #
+# Add `-v $PWD:/usr/local/apache2/htdocs/' to the run-command if you want to
+# test your local changes (you'll have to run ./install-dependencies.sh again).
+#
 
 FROM httpd:2.4
 MAINTAINER tom.gottfried@intevation.de