Commit 98cdbaa0 authored by Maxime Chaillet's avatar Maxime Chaillet

remove installation of apache2 from docker file. Use the apapche inside the httpd docker image.

parent 8012a2fb
<VirtualHost *:80>
# The ServerName directive sets the request scheme, hostname and port that
# load the rewrite module for httpd docker image. It is done this way because
# a2enmod is not available in httpd docker image
LoadModule "rewrite modules/mod_rewrite.so"
# The ServerName directive sets the request scheme, hostname and port that
# the server uses to identify itself. This is used when creating
# redirection URLs. In the context of virtual hosts, the ServerName
# specifies what hostname must appear in the request's Host: header to
......
......@@ -6,14 +6,15 @@ ENV http_proxy http://proxy.esrf.fr:3128
ENV https_proxy https://proxy.esrf.fr:3128
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update
RUN apt-get install apache2 -y
# RUN apt-get update
# RUN apt-get install apache2 -y
ADD www /var/www/html/
ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
RUN a2enmod rewrite
ADD www /usr/local/apache2/htdocs/
# ADD 000-default.conf /etc/apache2/sites-available/000-default.conf
COPY myHttpd.conf /usr/local/apache2/conf/httpd.conf
# RUN a2enmod rewrite
EXPOSE 80
CMD /usr/sbin/apache2ctl -D FOREGROUND
# CMD /usr/sbin/apache2ctl -D FOREGROUND
......
This diff is collapsed.
docker run -p 8092:80 -i -t dockcs.esrf.fr/dau/doi:1.0.0-SNAPSHOT
docker run -p 8092:80 -dit --name doiLandingPage dockcs.esrf.fr/dau/doi:1.0.0-SNAPSHOT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment