Merge branch 'docs-website' into develop

phpDocumentor · Apr 20, 2018 · 8fda15c · 8fda15c
2 parents a8b0f86 + 3f4f0e5
commit 8fda15c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/docs/.templates/responsive/layout.html b/docs/.templates/responsive/layout.html
@@ -20,7 +20,7 @@ <h3>{{ _('Navigation') }}</h3>
         {%- endfor %}
         {%- block rootrellink %}
         <li>
-            <a href="http://www.phpdoc.org">Homepage</a> {{ reldelim1 }}
+            <a href="https://www.phpdoc.org">Homepage</a> {{ reldelim1 }}
         </li>
         <li>
             <a href="{{ pathto(master_doc) }}">Documentation</a> {{ reldelim1 }}
@@ -201,14 +201,14 @@ <h3>{{ _('Search') }}</h3>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </a>
-            <a class="brand" href="/">phpDocumentor</a>
+            <a class="brand" href="https://www.phpdoc.org/git ">phpDocumentor</a>
 
             <div class="nav-collapse">
                 <ul class="nav">
                     <li class="dropdown">
                         <a href="#documentation" class="dropdown-toggle" data-toggle="dropdown"> Documentation<b class="caret"></b></a>
                         <ul class="dropdown-menu">
-                            <li><a href="/docs"><i class="icon-th"></i> phpDocumentor 2</a></li>
+                            <li><a href="https://www.phpdoc.org/docs"><i class="icon-th"></i> phpDocumentor 2</a></li>
                             <li><a href="http://manual.phpdoc.org"><i class="icon-th"></i> phpDocumentor 1</a></li>
                         </ul>
                     </li>
@@ -218,9 +218,9 @@ <h3>{{ _('Search') }}</h3>
                             <li><a href="http://demo.phpdoc.org/Responsive/"><i class="icon-list-alt"></i> Responsive</a></li>
                         </ul>
                     </li>
-                    <li><a href="/templates"><i class="icon-list-alt"></i> Templates</a></li>
-                    <li><a href="/contact"><i class="icon-list-alt"></i> Contact</a></li>
-                    <li><a href="/about"><i class="icon-list-alt"></i> About</a></li>
+                    <li><a href="https://www.phpdoc.org/templates"><i class="icon-list-alt"></i> Templates</a></li>
+                    <li><a href="https://www.phpdoc.org/contact"><i class="icon-list-alt"></i> Contact</a></li>
+                    <li><a href="https://www.phpdoc.org/about"><i class="icon-list-alt"></i> About</a></li>
                 </ul>
             </div>
         </div>

diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -0,0 +1,23 @@
+FROM python:2-slim-stretch
+
+ENV LANG en_US.UTF-8
+ENV BUILDDIR /var/www
+RUN mkdir -p /usr/share/man/man1 \
+  && apt-get update && apt-get install -yq python-sphinx plantuml make \
+  && apt-get install --no-install-recommends -yq nginx \
+  && rm -rf /var/lib/apt/lists/*
+
+ADD . /src
+
+RUN  cd /src \
+  && make BUILDDIR=$BUILDDIR clean html \
+  && apt-get remove -yq python-sphinx plantuml make \
+    # forward request and error logs to docker log collector
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+EXPOSE 80
+
+STOPSIGNAL SIGTERM
+
+CMD ["nginx", "-g", "daemon off;"]