diff Dockerfile @ 1188:5489ae5ef9e0

Migrate Dockerfile to Debian. This avoids need for custom httpd configuration and certificate problems with curl.
author Tom Gottfried <tom@intevation.de>
date Wed, 07 Sep 2016 12:57:19 +0200
parents 3ef492b5240b
children
line wrap: on
line diff
--- a/Dockerfile	Thu Aug 04 17:15:57 2016 +0200
+++ b/Dockerfile	Wed Sep 07 12:57:19 2016 +0200
@@ -12,17 +12,17 @@
 #
 # 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
+# Add `-v $PWD:/var/www/html/' 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
+FROM debian:jessie
 MAINTAINER tom.gottfried@intevation.de
 
-RUN apt-get update -y && apt-get install -y curl unzip python
+RUN apt-get update -y && apt-get install -y curl unzip python apache2
 
-ADD . /usr/local/apache2/htdocs/
-WORKDIR /usr/local/apache2/htdocs/
+ADD . /var/www/html
+WORKDIR /var/www/html
 
 #
 # Install dependencies
@@ -32,9 +32,12 @@
 #
 # httpd setup
 #
-RUN ln -sf $PWD/custom-httpd.conf $HTTPD_PREFIX/conf/httpd.conf
-RUN ln -sf $PWD/custom-vhosts.conf $HTTPD_PREFIX/conf/extra/httpd-vhosts.conf
+RUN a2enmod proxy
+RUN a2enmod proxy_http
+RUN a2enmod headers
+RUN ln -sf $PWD/custom-vhosts.conf /etc/apache2/conf-available/lada.conf
+RUN a2enconf lada
 
 EXPOSE 80 81 82 83 84
 
-CMD ["httpd-foreground"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

http://lada.wald.intevation.org