##// END OF EJS Templates
merge with stable...
merge with stable There were a handful of merge conflicts in the wire protocol code due to significant refactoring in default. When resolving the conflicts, I tried to produce the minimal number of changes to make the incoming security patches work with the new code. I will send some follow-up commits to get the security patches better integrated into default.

File last commit:

r23399:fd5247a8 default
r36778:7bf80d9d merge default
Show More
Dockerfile
23 lines | 520 B | text/x-dockerfile-config | DockerLexer
Gregory Szorc
docker: add Docker files for running an Apache mod_wsgi server...
r23399 FROM debian:wheezy
ENV DEBIAN_FRONTEND noninteractive
ENV WSGI_PROCESSES 4
ENV WSGI_THREADS 1
ENV WSGI_MAX_REQUESTS 100000
EXPOSE 80
VOLUME ["/var/hg/htdocs", "/var/hg/repos"]
RUN apt-get update && apt-get -y install libapache2-mod-wsgi python-dev vim
# Install our own Apache site.
RUN a2dissite 000-default
ADD vhost.conf /etc/apache2/sites-available/hg
RUN a2ensite hg
ADD hgwebconfig /defaulthgwebconfig
ADD entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/usr/sbin/apache2", "-DFOREGROUND"]