Commit 21867c47 authored by Maxime Chaillet's avatar Maxime Chaillet

Apply changes to DockerFile and which have been lost during merging process.

parent 5392f03f
...@@ -6,11 +6,10 @@ ENV http_proxy ...@@ -6,11 +6,10 @@ ENV http_proxy
ENV https_proxy ENV https_proxy
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update # RUN apt-get update
RUN apt-get install apache2 -y # RUN apt-get install apache2 -y
ADD www /var/www/html/ 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
CMD /usr/sbin/apache2ctl -D FOREGROUND # CMD /usr/sbin/apache2ctl -D FOREGROUND
\ No newline at end of file
docker run -p 8092:80 -i -t docker run -p 8092:80 -dit --name doiLandingPage
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