| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197 |
- diff --git a/docs/Dockerfile b/docs/Dockerfile
- index bc2b73b..b9808b2 100644
- --- a/docs/Dockerfile
- +++ b/docs/Dockerfile
- @@ -4,14 +4,24 @@ MAINTAINER SvenDowideit@docker.com
- # docker build -t docker:docs . && docker run -p 8000:8000 docker:docs
- #
-
- -RUN apt-get update && apt-get install -yq make python-pip python-setuptools
- -
- +RUN apt-get update && apt-get install -yq make python-pip python-setuptools
- RUN pip install mkdocs
-
- +RUN apt-get install -yq vim-tiny git pandoc
- +
- +# pip installs from docs/requirements.txt, but here to increase cacheability
- +RUN pip install Sphinx==1.2.1
- +RUN pip install sphinxcontrib-httpdomain==1.2.0
- +
- ADD . /docs
- +
- +#build the sphinx html
- +RUN make -C /docs clean docs
- +
- WORKDIR /docs
-
- -CMD ["mkdocs", "serve"]
- +#CMD ["mkdocs", "serve"]
- +CMD bash
-
- # note, EXPOSE is only last because of https://github.com/dotcloud/docker/issues/3525
- EXPOSE 8000
- diff --git a/docs/theme/docker/layout.html b/docs/theme/docker/layout.html
- index 7d78fb9..0dac9e0 100755
- --- a/docs/theme/docker/layout.html
- +++ b/docs/theme/docker/layout.html
- @@ -63,48 +63,6 @@
-
- <body>
-
- -<div id="wrap">
- -<div class="navbar navbar-static-top navbar-inner navbar-fixed-top ">
- - <div class="navbar-dotcloud">
- - <div class="container">
- -
- - <div style="float: right" class="pull-right">
- - <ul class="nav">
- - <li id="nav-introduction"><a href="http://www.docker.io/" title="Docker Homepage">Home</a></li>
- - <li id="nav-about"><a href="http://www.docker.io/about/" title="About">About</a></li>
- - <li id="nav-gettingstarted"><a href="http://www.docker.io/gettingstarted/">Getting started</a></li>
- - <li id="nav-community"><a href="http://www.docker.io/community/" title="Community">Community</a></li>
- - <li id="nav-documentation" class="active"><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
- - <li id="nav-blog"><a href="http://blog.docker.io/" title="Docker Blog">Blog</a></li>
- - <li id="nav-index"><a href="http://index.docker.io/" title="Docker Image Index, find images here">INDEX <img class="inline-icon" alt="link to external site" src="{{ pathto('_static/img/external-link-icon.png', 1) }}" title="external link"> </a></li>
- - </ul>
- - </div>
- -
- - <div class="brand-logo">
- - <a href="http://www.docker.io" title="Docker Homepage"><img src="{{ pathto('_static/img/docker-top-logo.png', 1) }}" alt="Docker logo"></a>
- - </div>
- - </div>
- - </div>
- -</div>
- -
- -<div class="container-fluid">
- -
- - <!-- Docs nav
- - ================================================== -->
- - <div class="row-fluid main-row">
- -
- - <div class="sidebar bs-docs-sidebar">
- - <div class="page-title" >
- - <h4>DOCUMENTATION</h4>
- - </div>
- -
- - {{ toctree(collapse=False, maxdepth=3) }}
- - <form>
- - <input type="text" id="st-search-input" class="st-search-input span3" placeholder="search in documentation" style="width:210px;" />
- - <div id="st-results-container"></div>
- - </form>
- - </div>
- -
- <!-- body block -->
- <div class="main-content">
-
- @@ -114,111 +72,7 @@
- {% block body %}{% endblock %}
- </section>
-
- - <div class="pull-right"><a href="https://github.com/dotcloud/docker/blob/{{ github_tag }}/docs/sources/{{ pagename }}.rst" title="edit this article">Edit this article on GitHub</a></div>
- </div>
- - </div>
- -</div>
- -
- -<div id="push-the-footer"></div>
- -</div> <!-- end wrap for pushing footer -->
- -
- -<div id="footer">
- - <div class="footer-landscape">
- - <div class="footer-landscape-image">
- - <!-- footer -->
- - <div class="container">
- - <div class="row footer">
- - <div class="span12 tbox">
- - <div class="tbox">
- - <p>Docker is an open source project, sponsored by <a href="https://www.docker.com">Docker Inc.</a>, under the <a href="https://github.com/dotcloud/docker/blob/master/LICENSE" title="Docker licence, hosted in the Github repository">apache 2.0 licence</a></p>
- - <p>Documentation proudly hosted by <a href="http://www.readthedocs.org">Read the Docs</a></p>
- - </div>
- -
- - <div class="social links">
- - <a title="Docker on Twitter" class="twitter" href="http://twitter.com/docker">Twitter</a>
- - <a title="Docker on GitHub" class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
- - <a title="Docker on Reddit" class="reddit" href="http://www.reddit.com/r/Docker/">Reddit</a>
- - <a title="Docker on Google+" class="googleplus" href="https://plus.google.com/u/0/b/100381662757235514581/communities/108146856671494713993">Google+</a>
- - <a title="Docker on Facebook" class="facebook" href="https://www.facebook.com/docker.run">Facebook</a>
- - <a title="Docker on SlideShare" class="slideshare" href="http://www.slideshare.net/dotCloud">Slideshare</a>
- - <a title="Docker on Youtube" class="youtube" href="http://www.youtube.com/user/dockerrun/">Youtube</a>
- - <a title="Docker on Flickr" class="flickr" href="http://www.flickr.com/photos/99741659@N08/">Flickr</a>
- - <a title="Docker on LinkedIn" class="linkedin" href="http://www.linkedin.com/company/dotcloud">LinkedIn</a>
- - </div>
- -
- - <div class="tbox version-flyer ">
- - <div class="content">
- - <p class="version-note">Note: You are currently browsing the development documentation. The current release may work differently.</p>
- -
- - <small>Available versions:</small>
- - <ul class="inline">
- - {% for slug, url in versions %}
- - <li class="alternative"><a href="{{ url }}{%- for word in pagename.split('/') -%}
- - {%- if word != 'index' -%}
- - {%- if word != '' -%}
- - {{ word }}/
- - {%- endif -%}
- - {%- endif -%}
- - {%- endfor -%}"
- - title="Switch to {{ slug }}">{{ slug }}</a></li>
- - {% endfor %}
- - </ul>
- - </div>
- - </div>
- -
- -
- - </div>
- - </div>
- - </div>
- - </div>
- - <!-- end of footer -->
- - </div>
- -
- -</div>
- -
- -
- -<script type="text/javascript" src="{{ pathto('_static/js/docs.js', 1) }}"></script>
- -
- -<!-- Swiftype search -->
- -
- -<script type="text/javascript">
- - var Swiftype = window.Swiftype || {};
- - (function() {
- - Swiftype.key = 'pWPnnyvwcfpcrw1o51Sz';
- - Swiftype.inputElement = '#st-search-input';
- - Swiftype.resultContainingElement = '#st-results-container';
- - Swiftype.attachElement = '#st-search-input';
- - Swiftype.renderStyle = "overlay";
- - // from https://swiftype.com/questions/how-can-i-make-more-popular-content-rank-higher
- - // Use "page" for now -- they don't subgroup by document type yet.
- - Swiftype.searchFunctionalBoosts = {"page": {"popularity": "linear"}};
- -
- - var script = document.createElement('script');
- - script.type = 'text/javascript';
- - script.async = true;
- - script.src = "//swiftype.com/embed.js";
- - var entry = document.getElementsByTagName('script')[0];
- - entry.parentNode.insertBefore(script, entry);
- - }());
- -</script>
- -
- -
- -<!-- Google analytics -->
- -<script type="text/javascript">
- -
- - var _gaq = _gaq || [];
- - _gaq.push(['_setAccount', 'UA-6096819-11']);
- - _gaq.push(['_setDomainName', 'docker.io']);
- - _gaq.push(['_setAllowLinker', true]);
- - _gaq.push(['_trackPageview']);
- -
- - (function() {
- - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- - })();
- -
- -</script>
-
- </body>
- </html>
|
