From 102c00e071b19d740eebbc2c298e559a35f57cd7 Mon Sep 17 00:00:00 2001 From: John Mulhausen Date: Wed, 17 May 2017 12:33:09 -0700 Subject: [PATCH] Docker Library import (#3063) * Docker Library import * Auto-gen Samples TOC * Modular hovers on Glossary page * TOC sync fix --- .gitmodules | 3 +++ _data/glossary.yaml | 5 ++--- _data/toc.yaml | 3 +++ _includes/generateTOC.html | 3 +++ _includes/tree.html | 3 ++- _layouts/docs.html | 2 +- _layouts/library.html | 22 ++++++++++++++++++++++ glossary.md | 7 +++++-- js/docs.js | 6 ++++++ samples/adminer.md | 6 ++++++ samples/aerospike.md | 6 ++++++ samples/alpine.md | 6 ++++++ samples/amazonlinux.md | 6 ++++++ samples/arangodb.md | 6 ++++++ samples/backdrop.md | 6 ++++++ samples/bash.md | 6 ++++++ samples/bonita.md | 6 ++++++ samples/buildpack-deps.md | 6 ++++++ samples/busybox.md | 6 ++++++ samples/cassandra.md | 6 ++++++ samples/celery.md | 6 ++++++ samples/centos.md | 6 ++++++ samples/chronograf.md | 6 ++++++ samples/cirros.md | 6 ++++++ samples/clearlinux.md | 6 ++++++ samples/clojure.md | 6 ++++++ samples/composer.md | 6 ++++++ samples/consul.md | 6 ++++++ samples/convertigo.md | 6 ++++++ samples/couchbase.md | 6 ++++++ samples/couchdb.md | 6 ++++++ samples/crate.md | 6 ++++++ samples/crux.md | 6 ++++++ samples/debian.md | 6 ++++++ samples/django.md | 6 ++++++ samples/docker.md | 6 ++++++ samples/drupal.md | 6 ++++++ samples/eclipse-mosquitto.md | 6 ++++++ samples/eggdrop.md | 6 ++++++ samples/elasticsearch.md | 6 ++++++ samples/elixir.md | 6 ++++++ samples/erlang.md | 6 ++++++ samples/fedora.md | 6 ++++++ samples/fsharp.md | 6 ++++++ samples/gazebo.md | 6 ++++++ samples/gcc.md | 6 ++++++ samples/geonetwork.md | 6 ++++++ samples/ghost.md | 6 ++++++ samples/golang.md | 6 ++++++ samples/gradle.md | 6 ++++++ samples/groovy.md | 6 ++++++ samples/haproxy.md | 6 ++++++ samples/haskell.md | 6 ++++++ samples/haxe.md | 6 ++++++ samples/httpd.md | 6 ++++++ samples/hylang.md | 6 ++++++ samples/ibmjava.md | 6 ++++++ samples.md => samples/index.md | 16 +++++++++++----- samples/influxdb.md | 6 ++++++ samples/iojs.md | 6 ++++++ samples/irssi.md | 6 ++++++ samples/java.md | 6 ++++++ samples/jenkins.md | 6 ++++++ samples/jetty.md | 6 ++++++ samples/joomla.md | 6 ++++++ samples/jruby.md | 6 ++++++ samples/julia.md | 6 ++++++ samples/kaazing-gateway.md | 6 ++++++ samples/kapacitor.md | 6 ++++++ samples/kibana.md | 6 ++++++ samples/known.md | 6 ++++++ samples/kong.md | 6 ++++++ samples/library | 1 + samples/lightstreamer.md | 6 ++++++ samples/logstash.md | 6 ++++++ samples/mageia.md | 6 ++++++ samples/mariadb.md | 6 ++++++ samples/maven.md | 6 ++++++ samples/memcached.md | 6 ++++++ samples/mongo-express.md | 6 ++++++ samples/mongo.md | 6 ++++++ samples/mono.md | 6 ++++++ samples/mysql.md | 6 ++++++ samples/nats-streaming.md | 6 ++++++ samples/nats.md | 6 ++++++ samples/neo4j.md | 6 ++++++ samples/neurodebian.md | 6 ++++++ samples/nextcloud.md | 6 ++++++ samples/nginx.md | 6 ++++++ samples/node.md | 6 ++++++ samples/notary.md | 6 ++++++ samples/nuxeo.md | 6 ++++++ samples/odoo.md | 6 ++++++ samples/openjdk.md | 6 ++++++ samples/opensuse.md | 6 ++++++ samples/oraclelinux.md | 6 ++++++ samples/orientdb.md | 6 ++++++ samples/owncloud.md | 6 ++++++ samples/percona.md | 6 ++++++ samples/perl.md | 6 ++++++ samples/photon.md | 6 ++++++ samples/php-zendserver.md | 6 ++++++ samples/php.md | 6 ++++++ samples/piwik.md | 6 ++++++ samples/plone.md | 6 ++++++ samples/postgres.md | 6 ++++++ samples/pypy.md | 6 ++++++ samples/python.md | 6 ++++++ samples/r-base.md | 6 ++++++ samples/rabbitmq.md | 6 ++++++ samples/rails.md | 6 ++++++ samples/rakudo-star.md | 6 ++++++ samples/rapidoid.md | 6 ++++++ samples/redis.md | 6 ++++++ samples/redmine.md | 6 ++++++ samples/registry.md | 6 ++++++ samples/rethinkdb.md | 6 ++++++ samples/rocket.chat.md | 6 ++++++ samples/ros.md | 6 ++++++ samples/ruby.md | 6 ++++++ samples/scratch.md | 6 ++++++ samples/sentry.md | 6 ++++++ samples/silverpeas.md | 6 ++++++ samples/solr.md | 6 ++++++ samples/sonarqube.md | 6 ++++++ samples/sourcemage.md | 6 ++++++ samples/spiped.md | 6 ++++++ samples/storm.md | 6 ++++++ samples/swarm.md | 6 ++++++ samples/swift.md | 6 ++++++ samples/telegraf.md | 6 ++++++ samples/thrift.md | 6 ++++++ samples/tomcat.md | 6 ++++++ samples/tomee.md | 6 ++++++ samples/traefik.md | 6 ++++++ samples/ubuntu.md | 6 ++++++ samples/vault.md | 6 ++++++ samples/websphere-liberty.md | 6 ++++++ samples/wordpress.md | 6 ++++++ samples/xwiki.md | 6 ++++++ samples/znc.md | 6 ++++++ samples/zookeeper.md | 6 ++++++ 142 files changed, 845 insertions(+), 12 deletions(-) create mode 100644 _includes/generateTOC.html create mode 100644 _layouts/library.html create mode 100644 samples/adminer.md create mode 100644 samples/aerospike.md create mode 100644 samples/alpine.md create mode 100644 samples/amazonlinux.md create mode 100644 samples/arangodb.md create mode 100644 samples/backdrop.md create mode 100644 samples/bash.md create mode 100644 samples/bonita.md create mode 100644 samples/buildpack-deps.md create mode 100644 samples/busybox.md create mode 100644 samples/cassandra.md create mode 100644 samples/celery.md create mode 100644 samples/centos.md create mode 100644 samples/chronograf.md create mode 100644 samples/cirros.md create mode 100644 samples/clearlinux.md create mode 100644 samples/clojure.md create mode 100644 samples/composer.md create mode 100644 samples/consul.md create mode 100644 samples/convertigo.md create mode 100644 samples/couchbase.md create mode 100644 samples/couchdb.md create mode 100644 samples/crate.md create mode 100644 samples/crux.md create mode 100644 samples/debian.md create mode 100644 samples/django.md create mode 100644 samples/docker.md create mode 100644 samples/drupal.md create mode 100644 samples/eclipse-mosquitto.md create mode 100644 samples/eggdrop.md create mode 100644 samples/elasticsearch.md create mode 100644 samples/elixir.md create mode 100644 samples/erlang.md create mode 100644 samples/fedora.md create mode 100644 samples/fsharp.md create mode 100644 samples/gazebo.md create mode 100644 samples/gcc.md create mode 100644 samples/geonetwork.md create mode 100644 samples/ghost.md create mode 100644 samples/golang.md create mode 100644 samples/gradle.md create mode 100644 samples/groovy.md create mode 100644 samples/haproxy.md create mode 100644 samples/haskell.md create mode 100644 samples/haxe.md create mode 100644 samples/httpd.md create mode 100644 samples/hylang.md create mode 100644 samples/ibmjava.md rename samples.md => samples/index.md (86%) create mode 100644 samples/influxdb.md create mode 100644 samples/iojs.md create mode 100644 samples/irssi.md create mode 100644 samples/java.md create mode 100644 samples/jenkins.md create mode 100644 samples/jetty.md create mode 100644 samples/joomla.md create mode 100644 samples/jruby.md create mode 100644 samples/julia.md create mode 100644 samples/kaazing-gateway.md create mode 100644 samples/kapacitor.md create mode 100644 samples/kibana.md create mode 100644 samples/known.md create mode 100644 samples/kong.md create mode 160000 samples/library create mode 100644 samples/lightstreamer.md create mode 100644 samples/logstash.md create mode 100644 samples/mageia.md create mode 100644 samples/mariadb.md create mode 100644 samples/maven.md create mode 100644 samples/memcached.md create mode 100644 samples/mongo-express.md create mode 100644 samples/mongo.md create mode 100644 samples/mono.md create mode 100644 samples/mysql.md create mode 100644 samples/nats-streaming.md create mode 100644 samples/nats.md create mode 100644 samples/neo4j.md create mode 100644 samples/neurodebian.md create mode 100644 samples/nextcloud.md create mode 100644 samples/nginx.md create mode 100644 samples/node.md create mode 100644 samples/notary.md create mode 100644 samples/nuxeo.md create mode 100644 samples/odoo.md create mode 100644 samples/openjdk.md create mode 100644 samples/opensuse.md create mode 100644 samples/oraclelinux.md create mode 100644 samples/orientdb.md create mode 100644 samples/owncloud.md create mode 100644 samples/percona.md create mode 100644 samples/perl.md create mode 100644 samples/photon.md create mode 100644 samples/php-zendserver.md create mode 100644 samples/php.md create mode 100644 samples/piwik.md create mode 100644 samples/plone.md create mode 100644 samples/postgres.md create mode 100644 samples/pypy.md create mode 100644 samples/python.md create mode 100644 samples/r-base.md create mode 100644 samples/rabbitmq.md create mode 100644 samples/rails.md create mode 100644 samples/rakudo-star.md create mode 100644 samples/rapidoid.md create mode 100644 samples/redis.md create mode 100644 samples/redmine.md create mode 100644 samples/registry.md create mode 100644 samples/rethinkdb.md create mode 100644 samples/rocket.chat.md create mode 100644 samples/ros.md create mode 100644 samples/ruby.md create mode 100644 samples/scratch.md create mode 100644 samples/sentry.md create mode 100644 samples/silverpeas.md create mode 100644 samples/solr.md create mode 100644 samples/sonarqube.md create mode 100644 samples/sourcemage.md create mode 100644 samples/spiped.md create mode 100644 samples/storm.md create mode 100644 samples/swarm.md create mode 100644 samples/swift.md create mode 100644 samples/telegraf.md create mode 100644 samples/thrift.md create mode 100644 samples/tomcat.md create mode 100644 samples/tomee.md create mode 100644 samples/traefik.md create mode 100644 samples/ubuntu.md create mode 100644 samples/vault.md create mode 100644 samples/websphere-liberty.md create mode 100644 samples/wordpress.md create mode 100644 samples/xwiki.md create mode 100644 samples/znc.md create mode 100644 samples/zookeeper.md diff --git a/.gitmodules b/.gitmodules index 024b0fead3..ece9d0f3d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ url = https://github.com/go-yaml/yaml.git branch = a5b47d31c556af34a302ce5d659e6fea44d90de0 +[submodule "samples/library"] + path = samples/library + url = https://github.com/docker-library/docs.git diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 47b5ccb24c..a821454158 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -177,14 +177,13 @@ Machine: | *Also known as : docker-machine* namespace: | - A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html){: target="_blank" class="_"} + A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html) is a Linux kernel feature that isolates and vitualizes system resources. Processes which restricted to a namespace can only interact with resources or processes that are part of the same namespace. Namespaces are an important part of Docker's isolation model. Namespaces exist for each type of resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control), and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run.md) - and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine){ :target="_blank" class="_" }. - + and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine). node: | A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual machine running an instance of the Docker Engine in swarm mode. diff --git a/_data/toc.yaml b/_data/toc.yaml index 5966423831..d59d33ba3f 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1187,6 +1187,9 @@ reference: samples: - path: /samples/#tutorial-labs title: Tutorial labs +- sectiontitle: Library references + section: + - generateTOC: library - sectiontitle: Sample applications section: - path: /samples/ diff --git a/_includes/generateTOC.html b/_includes/generateTOC.html new file mode 100644 index 0000000000..c2b317548c --- /dev/null +++ b/_includes/generateTOC.html @@ -0,0 +1,3 @@ +{% if include.tocToGenerate=="library"%}{% for thisPage in site.pages %}{% if thisPage.url contains "/samples/" and thisPage.url != "/samples/" %} +
  • {{ thisPage.title }}
  • +{% endif %}{% endfor %}{% endif %} diff --git a/_includes/tree.html b/_includes/tree.html index ace5f8e132..d7852aa2cd 100644 --- a/_includes/tree.html +++ b/_includes/tree.html @@ -1,9 +1,10 @@ {% assign foundBranch="false" %} {% for item in tree %} +{% if item.generateTOC %}{% include generateTOC.html tocToGenerate=item.generateTOC %}{% else %} {% if item.sectiontitle %}{% if foundBranch=="false" %}{% capture treeString %}{{ item.section | downcase }}{% endcapture %}{% capture pageURLString %}"{{ page.url }}"{% endcapture %}{% else %}{% assign treeString="" %}{% endif %}
  • {% else %}
  • {{ item.title }}
  • -{% endif %}{% endfor %} +{% endif %}{% endif %}{% endfor %} diff --git a/_layouts/docs.html b/_layouts/docs.html index ff8af32e66..7cdb1d4ee6 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -33,7 +33,7 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor % display: block; } - +