upstream/mercurial-mirror Files · contrib/docker/apache-server/Dockerfile

revert: properly revert to ancestor of p2 during merge (issue5052)...

revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

Gregory Szorc - - Load All Authors

File last commit:

r23399:fd5247a8 default


                r28192:cb6a952e

stable

Download file

             Dockerfile
        
                    23 lines
            
             | 520 B
            
                | text/x-dockerfile-config
            
             |
                DockerLexer
            
             / contrib / docker / apache-server / Dockerfile
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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"]

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				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"]