Commit 2fbb5f8e authored by Maxime Chaillet's avatar Maxime Chaillet

Merge branch 'issue32' into 'master'

reset all changes on this branch because the deployment fails and the problem is…

See merge request !35
parents df39bb7d 9afe7a8b
<VirtualHost *:80>
# 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
# match this virtual host. For the default virtual host (this file) this
# value is not decisive as it is used as a last resort host regardless.
# However, you must set it for any further virtual host explicitly.
#ServerName www.example.com
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
# It is also possible to configure the loglevel for particular
# modules, e.g.
#LogLevel info ssl:warn
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
# For most configuration files from conf-available/, which are
# enabled or disabled at a global level, it is possible to
# include a line for only one particular virtual host. For example the
# following line enables the CGI configuration for this host only
# after it has been globally disabled with "a2disconf".
#Include conf-available/serve-cgi-bin.conf
<Directory /var/www/html>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
# Uncomment this directive is you want to see apache2's
# default start page (in /apache2-default) when you go to /
#RewriteEngine On
#RewriteRule ^/index.html/(.+)/(.+)$ /folder1/dex.html?doi=$1.$2
</Directory>
</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
......@@ -6,8 +6,11 @@ ENV http_proxy http://proxy.esrf.fr:3128
ENV https_proxy https://proxy.esrf.fr:3128
ENV DEBIAN_FRONTEND noninteractive
ADD www /usr/local/apache2/htdocs/
COPY myHttpd.conf /usr/local/apache2/conf/httpd.conf
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
EXPOSE 80
CMD /usr/sbin/apache2ctl -D FOREGROUND
\ No newline at end of file
This diff is collapsed.
docker run -p 8092:80 -dit --name doiLandingPage dockcs.esrf.fr/dau/doi:1.0.0-SNAPSHOT
docker run -p 8092:80 -i -t 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