diff --git a/.gitignore b/.gitignore
index 8b9b2aee4e..18d594a854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ _site/**
.sass-cache/**
CNAME
Gemfile.lock
+_samples/library/**
diff --git a/.gitmodules b/.gitmodules
index 715bac31f5..cfc41a54c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,7 +10,3 @@
path = tests/src/gopkg.in/yaml.v2
url = https://github.com/go-yaml/yaml.git
branch = a5b47d31c556af34a302ce5d659e6fea44d90de0
-[submodule "samples/library"]
- path = samples/library
- url = https://github.com/docker-library/docs.git
- branch = master
diff --git a/MIGRATION.md b/MIGRATION.md
deleted file mode 100644
index 610f3cf237..0000000000
--- a/MIGRATION.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Migration
-
-This branch is the result of a migration of documentation from several public and
-private repositories. Every attempt has been made to preserve the history of all
-content which was migrated from public repositories, so that all public
-contributors retain credit for their work, and so that `git log` and
-`git blame` commands will work on historical files. At the time of the migration,
-over 42,000 public commits already exist in these files, which shows what a
-vibrant community the Docker documentation attracts. Thanks to everyone for their
-contributions.
-
-The following is a list of each public repository we imported from, the SHA
-reference we imported, and its tag if relevant.
-
-| Repository | SHA | Tag |
-|----------------------------------------|-----------------|------------------------|
-| https://github.com/docker/distribution | a9b1322edf48b1f | docs-v2.5.0-2016-07-28 |
-| https://github.com/docker/compose | 429320a4f8f4040 | docs-v1.8.0-2016-08-03 |
-| https://github.com/docker/swarm | 27968edd8a160f6 | v1.2.5 |
-| https://github.com/docker/notary | a6fda67663e158d | docs-v0.3-2016-08-03 |
-| https://github.com/docker/toolbox | c6457341499a196 | docs-v1.12.0-2016-09-16a |
-| https://github.com/docker/opensource | b9b87bed67f4289 | docs-2016-08-03 |
-| https://github.com/docker/kitematic | 02c9f9607128802 | v0.12.0 |
-| https://github.com/docker/machine | 95041b4cfe2e8b2 | docs-v0.8.2-2016-09-28 |
-| https://github.com/moby/moby | 3134c23b55eb100 | n/a |
diff --git a/_config.yml b/_config.yml
index 411ddd89a6..a5545149af 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,6 +14,10 @@ url: https://docs.docker.com
keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03"]
compose_current: 1.14.0
+collections:
+ samples:
+ output: true
+
gems:
- jekyll-redirect-from
- jekyll-seo-tag
diff --git a/_data/toc.yaml b/_data/toc.yaml
index 1bb790bf25..61c182d853 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -1260,28 +1260,16 @@ samples:
title: ASP.NET Core + SQL Server on Linux
- path: /engine/examples/couchdb_data_volumes/
title: CouchDB
- - path: /samples/couchbase/
- title: Couchbase
- nosync: true
- path: /compose/django/
title: Django and PostgreSQL
- - path: /samples/mongo/
- nosync: true
- title: MongoDB
- path: /engine/examples/postgresql_service/
title: PostgreSQL
- path: /compose/rails/
title: Rails and PostgreSQL
- - path: /samples/redis/
- title: Redis
- nosync: true
- path: /engine/examples/running_riak_service/
title: Riak
- path: /engine/examples/running_ssh_service/
title: SSHd
- - path: /samples/wordpress/
- title: WordPress
- nosync: true
manuals:
- sectiontitle: Docker Enterprise Edition
diff --git a/_includes/generateTOC.html b/_includes/generateTOC.html
index c2b317548c..d4db0fe9eb 100644
--- a/_includes/generateTOC.html
+++ b/_includes/generateTOC.html
@@ -1,3 +1,3 @@
-{% if include.tocToGenerate=="library"%}{% for thisPage in site.pages %}{% if thisPage.url contains "/samples/" and thisPage.url != "/samples/" %}
+{% if include.tocToGenerate=="library"%}{% for thisPage in site.samples %}
{{ thisPage.title }}
-{% endif %}{% endfor %}{% endif %}
+{% endfor %}{% endif %}
diff --git a/_layouts/library.html b/_layouts/library.html
deleted file mode 100644
index f35e2eff0d..0000000000
--- a/_layouts/library.html
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: docs
-toc_min: 1
-noratings: true
----
-{% capture fileToUse %}{% if page.file %}{{ page.file }}{% else %}README.md{% endif %}{% endcapture %}
-{% capture ghrepo %}{% include_relative library/{{ page.repo }}/github-repo %}{% endcapture %}
-{% capture markdowncontent %}
-{% include_relative library/{{ page.repo }}/README-short.txt %}
-
-GitHub repo: [{{ ghrepo | strip }}]({{ ghrepo | strip}}){: target="_blank"}
-
-> **Library reference**
->
-> This content is imported from
-> [the official Docker Library docs](https://github.com/docker-library/docs/tree/master/{{ page.repo}}/),
-> and is provided by the original uploader. You can view the Docker Store page for this repo at
-> [https://store.docker.com/images/{{ page.repo }}](https://store.docker.com/images/{{ page.repo }}).
-
-{% include_relative library/{{ page.repo }}/{{ fileToUse }} %}
-{% endcapture %}
-{{ markdowncontent | markdownify }}
diff --git a/_samples/boilerplate.txt b/_samples/boilerplate.txt
new file mode 100644
index 0000000000..9366faf6f4
--- /dev/null
+++ b/_samples/boilerplate.txt
@@ -0,0 +1,8 @@
+> **Library reference**
+>
+> This content is imported from
+> [the official Docker Library docs](https://github.com/docker-library/docs/tree/master/{{ page.repo}}/),
+> and is provided by the original uploader. You can view the Docker Store page for this image at
+> [https://store.docker.com/images/{{ page.repo }}](https://store.docker.com/images/{{ page.repo }})
+
+
diff --git a/_scripts/fetch-upstream-resources.sh b/_scripts/fetch-upstream-resources.sh
index 14b5fad05f..39bad5d12d 100755
--- a/_scripts/fetch-upstream-resources.sh
+++ b/_scripts/fetch-upstream-resources.sh
@@ -18,6 +18,49 @@ svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/cli/d
svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/engine/docs/api md_source/engine/api || (echo "Failed engine/api download" && exit -1) # This will only get you the old API MD files 1.18 through 1.24
svn co https://github.com/docker/distribution/"$DISTRIBUTION_SVN_BRANCH"/docs/spec md_source/registry/spec || (echo "Failed registry/spec download" && exit -1)
+# Get the Library docs
+svn co https://github.com/docker-library/docs/trunk md_source/_samples/library || (echo "Failed library download" && exit -1)
+# Remove symlinks to maintainer.md because they break jekyll and we don't use em
+find md_source/_samples/library -maxdepth 9 -type l -delete
+# Loop through the README.md files, turn them into rich index.md files
+FILES=$(find md_source/_samples/library -type f -name 'README.md')
+for f in $FILES
+do
+ curdir=$(dirname "${f}")
+ justcurdir="${curdir##*/}"
+ if [ -e ${curdir}/README-short.txt ]
+ then
+ # shortrm=$(<${curdir}/README-short.txt)
+ shortrm=$(cat ${curdir}/README-short.txt)
+ fi
+ echo "Adding front-matter to ${f} ..."
+ echo --- >> ${curdir}/front-matter.txt
+ echo title: "${justcurdir}" >> ${curdir}/front-matter.txt
+ echo keywords: library, sample, ${justcurdir} >> ${curdir}/front-matter.txt
+ echo repo: "${justcurdir}" >> ${curdir}/front-matter.txt
+ echo layout: docs >> ${curdir}/front-matter.txt
+ echo permalink: /samples/library/${justcurdir}/ >> ${curdir}/front-matter.txt
+ echo description: \| >> ${curdir}/front-matter.txt
+ echo \ \ ${shortrm} >> ${curdir}/front-matter.txt
+ echo --- >> ${curdir}/front-matter.txt
+ echo >> ${curdir}/front-matter.txt
+ echo ${shortrm} >> ${curdir}/front-matter.txt
+ echo >> ${curdir}/front-matter.txt
+ if [ -e ${curdir}/github-repo ]
+ then
+ # gitrepo=$(<${curdir}/github-repo)
+ gitrepo=$(cat ${curdir}/github-repo)
+ echo >> ${curdir}/front-matter.txt
+ echo GitHub repo: \["${gitrepo}"\]\("${gitrepo}"\)\{: target="_blank"\} >> ${curdir}/front-matter.txt
+ echo >> ${curdir}/front-matter.txt
+ fi
+ cat ${curdir}/front-matter.txt md_source/_samples/boilerplate.txt > ${curdir}/header.txt
+ echo {% raw %} >> ${curdir}/header.txt
+ cat ${curdir}/header.txt ${curdir}/README.md > ${curdir}/index.md
+ echo {% endraw %} >> ${curdir}/index.md
+ rm -rf ${curdir}/front-matter.txt
+ rm -rf ${curdir}/header.txt
+done
# Get the Engine APIs that are in Swagger
# Be careful with the locations on Github for these
@@ -47,3 +90,4 @@ wget -O md_source/registry/configuration.md https://raw.githubusercontent.com/do
rm md_source/registry/spec/api.md.tmpl
rm -rf md_source/apidocs/cloud-api-source
rm -rf md_source/tests
+rm md_source/_samples/library/index.md
diff --git a/metadata.txt b/metadata.txt
index 5cc721dab8..daeb74b342 100644
--- a/metadata.txt
+++ b/metadata.txt
@@ -9,4 +9,12 @@ layout: null
"description":{{ page.description | jsonify }},
"keywords":{{ page.keywords | jsonify }}
}
-{% endif %}{% endfor %}]}
+{% endif %}{% endfor %}
+{% for page in site.samples %},
+{
+"url":{{ page.url | jsonify }},
+"title":{{ page.title | jsonify }},
+"description":{{ page.description | strip | jsonify }},
+"keywords":{{ page.keywords | jsonify }}
+}
+{% endfor %}]}
diff --git a/redirect_from.csv b/redirect_from.csv
deleted file mode 100644
index 1776c976f2..0000000000
--- a/redirect_from.csv
+++ /dev/null
@@ -1,5 +0,0 @@
----
-layout: null
----
-{% for page in site.pages %}{% for redirect in page.redirect_from %}{{ redirect }},{{ page.url }}
-{% endfor %}{% endfor %}
diff --git a/samples/adminer.md b/samples/adminer.md
deleted file mode 100644
index 71f6877b0d..0000000000
--- a/samples/adminer.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Adminer
-keywords: library, sample, Adminer
-layout: library
-repo: adminer
----
diff --git a/samples/aerospike.md b/samples/aerospike.md
deleted file mode 100644
index 63806da082..0000000000
--- a/samples/aerospike.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Aerospike
-keywords: library, sample, Aerospike
-layout: library
-repo: aerospike
----
diff --git a/samples/alpine.md b/samples/alpine.md
deleted file mode 100644
index 2bea619dc1..0000000000
--- a/samples/alpine.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Alpine
-keywords: library, sample, Alpine
-layout: library
-repo: alpine
----
diff --git a/samples/amazonlinux.md b/samples/amazonlinux.md
deleted file mode 100644
index 12e756d2a3..0000000000
--- a/samples/amazonlinux.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Amazon Linux
-keywords: library, sample, Amazon Linux
-layout: library
-repo: amazonlinux
----
diff --git a/samples/arangodb.md b/samples/arangodb.md
deleted file mode 100644
index 71493b264f..0000000000
--- a/samples/arangodb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: ArangoDB
-keywords: library, sample, ArangoDB
-layout: library
-repo: arangodb
----
diff --git a/samples/backdrop.md b/samples/backdrop.md
deleted file mode 100644
index 32b281d34e..0000000000
--- a/samples/backdrop.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Backdrop
-keywords: library, sample, Backdrop
-layout: library
-repo: backdrop
----
diff --git a/samples/bash.md b/samples/bash.md
deleted file mode 100644
index a384b5ab0f..0000000000
--- a/samples/bash.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Bash
-keywords: library, sample, Bash
-layout: library
-repo: bash
----
diff --git a/samples/bonita.md b/samples/bonita.md
deleted file mode 100644
index 6a7c0021e0..0000000000
--- a/samples/bonita.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Bonita
-keywords: library, sample, Bonita
-layout: library
-repo: bonita
----
diff --git a/samples/buildpack-deps.md b/samples/buildpack-deps.md
deleted file mode 100644
index 960a49edf2..0000000000
--- a/samples/buildpack-deps.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: buildpack-deps
-keywords: library, sample, buildpack-deps
-layout: library
-repo: buildpack-deps
----
diff --git a/samples/busybox.md b/samples/busybox.md
deleted file mode 100644
index 452a6cf5d4..0000000000
--- a/samples/busybox.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: BusyBox
-keywords: library, sample, BusyBox
-layout: library
-repo: busybox
----
diff --git a/samples/cassandra.md b/samples/cassandra.md
deleted file mode 100644
index 7824d83103..0000000000
--- a/samples/cassandra.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Cassandra
-keywords: library, sample, Cassandra
-layout: library
-repo: cassandra
----
diff --git a/samples/celery.md b/samples/celery.md
deleted file mode 100644
index e4e258bea4..0000000000
--- a/samples/celery.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Celery
-keywords: library, sample, Celery
-layout: library
-repo: celery
----
diff --git a/samples/centos.md b/samples/centos.md
deleted file mode 100644
index a94f124ab0..0000000000
--- a/samples/centos.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: CentOS
-keywords: library, sample, CentOS
-layout: library
-repo: centos
----
diff --git a/samples/chronograf.md b/samples/chronograf.md
deleted file mode 100644
index 26fcc95ed8..0000000000
--- a/samples/chronograf.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Chronograf
-keywords: library, sample, Chronograf
-layout: library
-repo: chronograf
----
diff --git a/samples/cirros.md b/samples/cirros.md
deleted file mode 100644
index e8e4b980e6..0000000000
--- a/samples/cirros.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: CirrOS
-keywords: library, sample, CirrOS
-layout: library
-repo: cirros
----
diff --git a/samples/clearlinux.md b/samples/clearlinux.md
deleted file mode 100644
index 0a9cfb0883..0000000000
--- a/samples/clearlinux.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Clear Linux
-keywords: library, sample, Clear Linux
-layout: library
-repo: clearlinux
----
diff --git a/samples/clojure.md b/samples/clojure.md
deleted file mode 100644
index ac802ea097..0000000000
--- a/samples/clojure.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Clojure
-keywords: library, sample, Clojure
-layout: library
-repo: clojure
----
diff --git a/samples/composer.md b/samples/composer.md
deleted file mode 100644
index ed9dcce8a8..0000000000
--- a/samples/composer.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Composer
-keywords: library, sample, Composer
-layout: library
-repo: composer
----
diff --git a/samples/consul.md b/samples/consul.md
deleted file mode 100644
index dfba322263..0000000000
--- a/samples/consul.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Consul
-keywords: library, sample, Consul
-layout: library
-repo: consul
----
diff --git a/samples/convertigo.md b/samples/convertigo.md
deleted file mode 100644
index 32064c3ff5..0000000000
--- a/samples/convertigo.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Convertigo
-keywords: library, sample, Convertigo
-layout: library
-repo: convertigo
----
diff --git a/samples/couchbase.md b/samples/couchbase.md
deleted file mode 100644
index cf5ce5c4a9..0000000000
--- a/samples/couchbase.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Couchbase
-keywords: library, sample, Couchbase
-layout: library
-repo: couchbase
-redirect_from:
-- /engine/examples/couchbase/
----
diff --git a/samples/couchdb.md b/samples/couchdb.md
deleted file mode 100644
index 83a3dd5919..0000000000
--- a/samples/couchdb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: CouchDB
-keywords: library, sample, CouchDB
-layout: library
-repo: couchdb
----
diff --git a/samples/crate.md b/samples/crate.md
deleted file mode 100644
index f3bddb2e7f..0000000000
--- a/samples/crate.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Crate
-keywords: library, sample, Crate
-layout: library
-repo: crate
----
diff --git a/samples/crux.md b/samples/crux.md
deleted file mode 100644
index f41264b206..0000000000
--- a/samples/crux.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: CRUX
-keywords: library, sample, CRUX
-layout: library
-repo: crux
----
diff --git a/samples/debian.md b/samples/debian.md
deleted file mode 100644
index 9800804284..0000000000
--- a/samples/debian.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Debian
-keywords: library, sample, Debian
-layout: library
-repo: debian
----
diff --git a/samples/django.md b/samples/django.md
deleted file mode 100644
index fde81b5066..0000000000
--- a/samples/django.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Django
-keywords: library, sample, Django
-layout: library
-repo: django
----
diff --git a/samples/docker.md b/samples/docker.md
deleted file mode 100644
index 515fbe51e3..0000000000
--- a/samples/docker.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Docker in Docker
-keywords: library, sample, Docker in Docker
-layout: library
-repo: docker
----
diff --git a/samples/drupal.md b/samples/drupal.md
deleted file mode 100644
index 8dcbaab498..0000000000
--- a/samples/drupal.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Drupal
-keywords: library, sample, Drupal
-layout: library
-repo: drupal
----
diff --git a/samples/eclipse-mosquitto.md b/samples/eclipse-mosquitto.md
deleted file mode 100644
index 749e0d46c8..0000000000
--- a/samples/eclipse-mosquitto.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Eclipse Mosquitto
-keywords: library, sample, Eclipse Mosquitto
-layout: library
-repo: eclipse-mosquitto
----
diff --git a/samples/eggdrop.md b/samples/eggdrop.md
deleted file mode 100644
index 7705a2fe00..0000000000
--- a/samples/eggdrop.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Eggdrop
-keywords: library, sample, Eggdrop
-layout: library
-repo: eggdrop
----
diff --git a/samples/elasticsearch.md b/samples/elasticsearch.md
deleted file mode 100644
index 2d1425459c..0000000000
--- a/samples/elasticsearch.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Elasticsearch
-keywords: library, sample, Elasticsearch
-layout: library
-repo: elasticsearch
----
diff --git a/samples/elixir.md b/samples/elixir.md
deleted file mode 100644
index e6609f17a9..0000000000
--- a/samples/elixir.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Elixir
-keywords: library, sample, Elixir
-layout: library
-repo: elixir
----
diff --git a/samples/erlang.md b/samples/erlang.md
deleted file mode 100644
index 1e3871332b..0000000000
--- a/samples/erlang.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Erlang
-keywords: library, sample, Erlang
-layout: library
-repo: erlang
----
diff --git a/samples/fedora.md b/samples/fedora.md
deleted file mode 100644
index c3c0fa55a5..0000000000
--- a/samples/fedora.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fedora
-keywords: library, sample, Fedora
-layout: library
-repo: fedora
----
diff --git a/samples/fsharp.md b/samples/fsharp.md
deleted file mode 100644
index 5a9cc9a3e6..0000000000
--- a/samples/fsharp.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: F#
-keywords: library, sample, F#
-layout: library
-repo: fsharp
----
diff --git a/samples/gazebo.md b/samples/gazebo.md
deleted file mode 100644
index 0b1f5549ce..0000000000
--- a/samples/gazebo.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Gazebo
-keywords: library, sample, Gazebo
-layout: library
-repo: gazebo
----
diff --git a/samples/gcc.md b/samples/gcc.md
deleted file mode 100644
index 7e5979972c..0000000000
--- a/samples/gcc.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: The GNU Compiler Collection (GCC)
-keywords: library, sample, GNU Compiler Collection, GCC
-layout: library
-repo: gcc
----
diff --git a/samples/geonetwork.md b/samples/geonetwork.md
deleted file mode 100644
index 6a83d1f7c2..0000000000
--- a/samples/geonetwork.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: GeoNetwork
-keywords: library, sample, GeoNetwork
-layout: library
-repo: geonetwork
----
diff --git a/samples/ghost.md b/samples/ghost.md
deleted file mode 100644
index e3763af462..0000000000
--- a/samples/ghost.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ghost
-keywords: library, sample, Ghost
-layout: library
-repo: ghost
----
diff --git a/samples/golang.md b/samples/golang.md
deleted file mode 100644
index 8238ee89ca..0000000000
--- a/samples/golang.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Go (a.k.a., Golang)
-keywords: library, sample, Go, Golang
-layout: library
-repo: golang
----
diff --git a/samples/gradle.md b/samples/gradle.md
deleted file mode 100644
index a3ea968346..0000000000
--- a/samples/gradle.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Gradle
-keywords: library, sample, Gradle
-layout: library
-repo: gradle
----
diff --git a/samples/groovy.md b/samples/groovy.md
deleted file mode 100644
index ccb1f7751a..0000000000
--- a/samples/groovy.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Groovy
-keywords: library, sample, Groovy
-layout: library
-repo: groovy
----
diff --git a/samples/haproxy.md b/samples/haproxy.md
deleted file mode 100644
index 0ed639d7b3..0000000000
--- a/samples/haproxy.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: HAProxy
-keywords: library, sample, HAProxy
-layout: library
-repo: haproxy
----
diff --git a/samples/haskell.md b/samples/haskell.md
deleted file mode 100644
index 30f77510c1..0000000000
--- a/samples/haskell.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Haskell
-keywords: library, sample, Haskell
-layout: library
-repo: haskell
----
diff --git a/samples/haxe.md b/samples/haxe.md
deleted file mode 100644
index b57d25a712..0000000000
--- a/samples/haxe.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Haxe
-keywords: library, sample, Haxe
-layout: library
-repo: haxe
----
diff --git a/samples/httpd.md b/samples/httpd.md
deleted file mode 100644
index 2c4e6cf499..0000000000
--- a/samples/httpd.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Apache httpd
-keywords: library, sample, httpd, Apache
-layout: library
-repo: httpd
----
diff --git a/samples/hylang.md b/samples/hylang.md
deleted file mode 100644
index c7b9ee08f1..0000000000
--- a/samples/hylang.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Hy (a.k.a., Hylang)
-keywords: library, sample, Hy, Hylang
-layout: library
-repo: hylang
----
diff --git a/samples/ibmjava.md b/samples/ibmjava.md
deleted file mode 100644
index 78545daa60..0000000000
--- a/samples/ibmjava.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: IBM® SDK, Java™ Technology Edition
-keywords: library, sample, IBM Java, Java, IBM
-layout: library
-repo: ibmjava
----
diff --git a/samples/index.md b/samples/index.md
index 2d428a146f..6825a4676c 100644
--- a/samples/index.md
+++ b/samples/index.md
@@ -29,11 +29,12 @@ repository]({{ labsbase }}).
These docs are imported from
[the official Docker Library docs](https://github.com/docker-library/docs/),
and help you use some of the most popular software that has been
-"Dockerized."
+"Dockerized" into Docker images.
-| Software | Description |
-{% for thisPage in site.pages %}{% if thisPage.url contains "/samples/" and thisPage.url != "/samples/" %}| [{{ thisPage.title }}]({{ thisPage.url }}) | {% capture shortxt %}{% include_relative library/{{ thisPage.repo }}/README-short.txt %}{% endcapture %}{{ shortxt | strip }} |
-{% endif %}{% endfor %}
+| Image name | Description |
+| ---------- | ----------- |
+{% for page in site.samples %}| [{{ page.title }}]({{ page.url }}) | {{ page.description | strip }} |
+{% endfor %}
## Sample applications
@@ -44,12 +45,8 @@ Run popular software using Docker.
| [apt-cacher-ng](/engine/examples/apt-cacher-ng) | Run a Dockerized apt-cacher-ng instance. |
| [ASP.NET Core + SQL Server on Linux](/compose/aspnet-mssql-compose) | Run a Dockerized ASP.NET Core + SQL Server environment. |
| [CouchDB](/engine/examples/couchdb_data_volumes) | Run a Dockerized CouchDB instance. |
-| [Couchbase](/engine/examples/couchbase) | Run a Dockerized Couchbase instance. |
| [Django + PostgreSQL](/compose/django/) | Run a Dockerized Django + PostgreSQL environment. |
-| [MongoDB](/engine/examples/mongodb) | Run a Dockerized MongoDB instance. |
| [PostgreSQL](/engine/examples/postgresql_service) | Run a Dockerized PosgreSQL instance. |
| [Rails + PostgreSQL](/compose/rails/) | Run a Dockerized Rails + PostgreSQL environment. |
-| [Redis](/engine/examples/running_redis_service) | Run a Dockerized Redis instance. |
| [Riak](/engine/examples/running_riak_service) | Run a Dockerized Riak instance. |
| [SSHd](/engine/examples/running_ssh_service) | Run a Dockerized SSHd instance. |
-| [WordPress](/compose/wordpress/) | Run a Dockerized WordPress instance. |
diff --git a/samples/influxdb.md b/samples/influxdb.md
deleted file mode 100644
index 1bd093288f..0000000000
--- a/samples/influxdb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: InfluxDB
-keywords: library, sample, InfluxDB
-layout: library
-repo: influxdb
----
diff --git a/samples/iojs.md b/samples/iojs.md
deleted file mode 100644
index 2154e13d68..0000000000
--- a/samples/iojs.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: io.js
-keywords: library, sample, io.js, npm
-layout: library
-repo: iojs
----
diff --git a/samples/irssi.md b/samples/irssi.md
deleted file mode 100644
index 2e64f145a2..0000000000
--- a/samples/irssi.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Irssi
-keywords: library, sample, Irssi
-layout: library
-repo: irssi
----
diff --git a/samples/java.md b/samples/java.md
deleted file mode 100644
index 404011e702..0000000000
--- a/samples/java.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Java
-keywords: library, sample, Java
-layout: library
-repo: java
----
diff --git a/samples/jenkins.md b/samples/jenkins.md
deleted file mode 100644
index 916c4bd42c..0000000000
--- a/samples/jenkins.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Jenkins
-keywords: library, sample, Jenkins
-layout: library
-repo: jenkins
----
diff --git a/samples/jetty.md b/samples/jetty.md
deleted file mode 100644
index ecae61ced2..0000000000
--- a/samples/jetty.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Jetty
-keywords: library, sample, Java, Jetty
-layout: library
-repo: jetty
----
diff --git a/samples/joomla.md b/samples/joomla.md
deleted file mode 100644
index 6e1d83d906..0000000000
--- a/samples/joomla.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Joomla
-keywords: library, sample, Joomla
-layout: library
-repo: joomla
----
diff --git a/samples/jruby.md b/samples/jruby.md
deleted file mode 100644
index c14be8148f..0000000000
--- a/samples/jruby.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: JRuby
-keywords: library, sample, JRuby
-layout: library
-repo: jruby
----
diff --git a/samples/julia.md b/samples/julia.md
deleted file mode 100644
index 5cd787fb22..0000000000
--- a/samples/julia.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Julia
-keywords: library, sample, Julia
-layout: library
-repo: julia
----
diff --git a/samples/kaazing-gateway.md b/samples/kaazing-gateway.md
deleted file mode 100644
index 00923a7505..0000000000
--- a/samples/kaazing-gateway.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Kaazing Gateway
-keywords: library, sample, Kaazing Gateway
-layout: library
-repo: kaazing-gateway
----
diff --git a/samples/kapacitor.md b/samples/kapacitor.md
deleted file mode 100644
index 034564996e..0000000000
--- a/samples/kapacitor.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Kapacitor
-keywords: library, sample, Kapacitor
-layout: library
-repo: kapacitor
----
diff --git a/samples/kibana.md b/samples/kibana.md
deleted file mode 100644
index 371def2dc3..0000000000
--- a/samples/kibana.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Kibana
-keywords: library, sample, Kibana, Elasticsearch
-layout: library
-repo: kibana
----
diff --git a/samples/known.md b/samples/known.md
deleted file mode 100644
index b09e1ae51f..0000000000
--- a/samples/known.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Known
-keywords: library, sample, Known
-layout: library
-repo: known
----
diff --git a/samples/kong.md b/samples/kong.md
deleted file mode 100644
index d482d2e602..0000000000
--- a/samples/kong.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Kong
-keywords: library, sample, Kong
-layout: library
-repo: kong
----
diff --git a/samples/library b/samples/library
deleted file mode 160000
index 7d03e2198f..0000000000
--- a/samples/library
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d03e2198f07a2e95c6ab9c04d26f168dc8fa1e6
diff --git a/samples/lightstreamer.md b/samples/lightstreamer.md
deleted file mode 100644
index 84336f6838..0000000000
--- a/samples/lightstreamer.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Lightstreamer
-keywords: library, sample, Lightstreamer
-layout: library
-repo: lightstreamer
----
diff --git a/samples/logstash.md b/samples/logstash.md
deleted file mode 100644
index 9af39489cd..0000000000
--- a/samples/logstash.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Logstash
-keywords: library, sample, Logstash
-layout: library
-repo: logstash
----
diff --git a/samples/mageia.md b/samples/mageia.md
deleted file mode 100644
index 48e06dd1bd..0000000000
--- a/samples/mageia.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Mageia
-keywords: library, sample, Mageia
-layout: library
-repo: mageia
----
diff --git a/samples/mariadb.md b/samples/mariadb.md
deleted file mode 100644
index 15ab75e281..0000000000
--- a/samples/mariadb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: MariaDB
-keywords: library, sample, MariaDB
-layout: library
-repo: mariadb
----
diff --git a/samples/maven.md b/samples/maven.md
deleted file mode 100644
index ebbc8335d0..0000000000
--- a/samples/maven.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Maven
-keywords: library, sample, Maven
-layout: library
-repo: maven
----
diff --git a/samples/memcached.md b/samples/memcached.md
deleted file mode 100644
index a75918c6ba..0000000000
--- a/samples/memcached.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Memcached
-keywords: library, sample, Memcached
-layout: library
-repo: memcached
----
diff --git a/samples/mongo-express.md b/samples/mongo-express.md
deleted file mode 100644
index 42d8777841..0000000000
--- a/samples/mongo-express.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: mongo-express
-keywords: library, sample, mongo-express
-layout: library
-repo: mongo-express
----
diff --git a/samples/mongo.md b/samples/mongo.md
deleted file mode 100644
index d3b0827588..0000000000
--- a/samples/mongo.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: MongoDB
-keywords: library, sample, MongoDB
-layout: library
-repo: mongo
-redirect_from:
-- /engine/examples/mongodb/
----
diff --git a/samples/mono.md b/samples/mono.md
deleted file mode 100644
index 9c9311ad8e..0000000000
--- a/samples/mono.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Mono
-keywords: library, sample, Mono
-layout: library
-repo: mono
----
diff --git a/samples/mysql.md b/samples/mysql.md
deleted file mode 100644
index ea943185be..0000000000
--- a/samples/mysql.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: MySQL
-keywords: library, sample, MySQL
-layout: library
-repo: mysql
----
diff --git a/samples/nats-streaming.md b/samples/nats-streaming.md
deleted file mode 100644
index 908f8df6ae..0000000000
--- a/samples/nats-streaming.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: nats-streaming
-keywords: library, sample, nats-streaming
-layout: library
-repo: nats-streaming
----
diff --git a/samples/nats.md b/samples/nats.md
deleted file mode 100644
index 919df87f73..0000000000
--- a/samples/nats.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: nats
-keywords: library, sample, nats
-layout: library
-repo: nats
----
diff --git a/samples/neo4j.md b/samples/neo4j.md
deleted file mode 100644
index db77eacbac..0000000000
--- a/samples/neo4j.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Neo4j
-keywords: library, sample, Neo4j
-layout: library
-repo: neo4j
----
diff --git a/samples/neurodebian.md b/samples/neurodebian.md
deleted file mode 100644
index abbd3a923d..0000000000
--- a/samples/neurodebian.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: NeuroDebian
-keywords: library, sample, NeuroDebian
-layout: library
-repo: neurodebian
----
diff --git a/samples/nextcloud.md b/samples/nextcloud.md
deleted file mode 100644
index 1d09755fe7..0000000000
--- a/samples/nextcloud.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Nextcloud
-keywords: library, sample, Nextcloud
-layout: library
-repo: nextcloud
----
diff --git a/samples/nginx.md b/samples/nginx.md
deleted file mode 100644
index 9f6481debe..0000000000
--- a/samples/nginx.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Nginx
-keywords: library, sample, Nginx
-layout: library
-repo: nginx
----
diff --git a/samples/node.md b/samples/node.md
deleted file mode 100644
index f570c30e19..0000000000
--- a/samples/node.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Node.js
-keywords: library, sample, Node.js
-layout: library
-repo: node
----
diff --git a/samples/notary.md b/samples/notary.md
deleted file mode 100644
index 27484d5b0e..0000000000
--- a/samples/notary.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Notary
-keywords: library, sample, Notary
-layout: library
-repo: notary
----
diff --git a/samples/nuxeo.md b/samples/nuxeo.md
deleted file mode 100644
index db952f6521..0000000000
--- a/samples/nuxeo.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Nuxeo
-keywords: library, sample, Nuxeo
-layout: library
-repo: nuxeo
----
diff --git a/samples/odoo.md b/samples/odoo.md
deleted file mode 100644
index 4d39c23e42..0000000000
--- a/samples/odoo.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Odoo
-keywords: library, sample, Odoo
-layout: library
-repo: odoo
----
diff --git a/samples/openjdk.md b/samples/openjdk.md
deleted file mode 100644
index 6bc4d900db..0000000000
--- a/samples/openjdk.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: OpenJDK
-keywords: library, sample, OpenJDK
-layout: library
-repo: openjdk
----
diff --git a/samples/opensuse.md b/samples/opensuse.md
deleted file mode 100644
index c1c88ae125..0000000000
--- a/samples/opensuse.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: openSUSE
-keywords: library, sample, openSUSE
-layout: library
-repo: opensuse
----
diff --git a/samples/oraclelinux.md b/samples/oraclelinux.md
deleted file mode 100644
index e384acfb29..0000000000
--- a/samples/oraclelinux.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Oracle Linux
-keywords: library, sample, Oracle Linux
-layout: library
-repo: oraclelinux
----
diff --git a/samples/orientdb.md b/samples/orientdb.md
deleted file mode 100644
index f8c17cd26b..0000000000
--- a/samples/orientdb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: OrientDB
-keywords: library, sample, OrientDB
-layout: library
-repo: orientdb
----
diff --git a/samples/owncloud.md b/samples/owncloud.md
deleted file mode 100644
index b6bba8968e..0000000000
--- a/samples/owncloud.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: ownCloud
-keywords: library, sample, ownCloud
-layout: library
-repo: owncloud
----
diff --git a/samples/percona.md b/samples/percona.md
deleted file mode 100644
index c1c15f819c..0000000000
--- a/samples/percona.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Percona
-keywords: library, sample, Percona
-layout: library
-repo: percona
----
diff --git a/samples/perl.md b/samples/perl.md
deleted file mode 100644
index e7a6dac91e..0000000000
--- a/samples/perl.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Perl
-keywords: library, sample, Perl
-layout: library
-repo: perl
----
diff --git a/samples/photon.md b/samples/photon.md
deleted file mode 100644
index d8bad66f7c..0000000000
--- a/samples/photon.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Photon
-keywords: library, sample, Photon
-layout: library
-repo: photon
----
diff --git a/samples/php-zendserver.md b/samples/php-zendserver.md
deleted file mode 100644
index df27ddbd38..0000000000
--- a/samples/php-zendserver.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Zend Server
-keywords: library, sample, Zend Server
-layout: library
-repo: php-zendserver
----
diff --git a/samples/php.md b/samples/php.md
deleted file mode 100644
index 566b5f869f..0000000000
--- a/samples/php.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: PHP
-keywords: library, sample, PHP
-layout: library
-repo: php
----
diff --git a/samples/piwik.md b/samples/piwik.md
deleted file mode 100644
index 7383d9868b..0000000000
--- a/samples/piwik.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Piwik
-keywords: library, sample, Piwik
-layout: library
-repo: piwik
----
diff --git a/samples/plone.md b/samples/plone.md
deleted file mode 100644
index d4221a10bf..0000000000
--- a/samples/plone.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Plone
-keywords: library, sample, Plone
-layout: library
-repo: plone
----
diff --git a/samples/postgres.md b/samples/postgres.md
deleted file mode 100644
index 9d13c0f9a7..0000000000
--- a/samples/postgres.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: PostgreSQL
-keywords: library, sample, PostgreSQL
-layout: library
-repo: postgres
----
diff --git a/samples/pypy.md b/samples/pypy.md
deleted file mode 100644
index 14d05b6d03..0000000000
--- a/samples/pypy.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: PyPy
-keywords: library, sample, PyPy, Python
-layout: library
-repo: pypy
----
diff --git a/samples/python.md b/samples/python.md
deleted file mode 100644
index c3f9c7549e..0000000000
--- a/samples/python.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Python
-keywords: library, sample, Python
-layout: library
-repo: python
----
diff --git a/samples/r-base.md b/samples/r-base.md
deleted file mode 100644
index a18c616619..0000000000
--- a/samples/r-base.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: R (a.k.a., Rlang)
-keywords: library, sample, R, Rlang
-layout: library
-repo: r-base
----
diff --git a/samples/rabbitmq.md b/samples/rabbitmq.md
deleted file mode 100644
index 688547af8b..0000000000
--- a/samples/rabbitmq.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: RabbitMQ
-keywords: library, sample, RabbitMQ
-layout: library
-repo: rabbitmq
----
diff --git a/samples/rails.md b/samples/rails.md
deleted file mode 100644
index 98424ad35d..0000000000
--- a/samples/rails.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ruby on Rails
-keywords: library, sample, Ruby on Rails, Ruby, Rails
-layout: library
-repo: rails
----
diff --git a/samples/rakudo-star.md b/samples/rakudo-star.md
deleted file mode 100644
index 2ec4f8868e..0000000000
--- a/samples/rakudo-star.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Rakudo Star
-keywords: library, sample, Rakudo Star
-layout: library
-repo: rakudo-star
----
diff --git a/samples/rapidoid.md b/samples/rapidoid.md
deleted file mode 100644
index 3577accba7..0000000000
--- a/samples/rapidoid.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Rapidoid
-keywords: library, sample, Rapidoid
-layout: library
-repo: rapidoid
----
diff --git a/samples/redis.md b/samples/redis.md
deleted file mode 100644
index 79fb46fc5d..0000000000
--- a/samples/redis.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Redis
-keywords: library, sample, Redis
-layout: library
-repo: redis
-redirect_from:
-- /engine/examples/running_redis_service/
----
diff --git a/samples/redmine.md b/samples/redmine.md
deleted file mode 100644
index e4e0f15448..0000000000
--- a/samples/redmine.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Redmine
-keywords: library, sample, Redmine
-layout: library
-repo: redmine
----
diff --git a/samples/registry.md b/samples/registry.md
deleted file mode 100644
index 4321b67502..0000000000
--- a/samples/registry.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Docker Registry
-keywords: library, sample, registry, Docker Registry
-layout: library
-repo: registry
----
diff --git a/samples/rethinkdb.md b/samples/rethinkdb.md
deleted file mode 100644
index c7611fd3ff..0000000000
--- a/samples/rethinkdb.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: RethinkDB
-keywords: library, sample, RethinkDB
-layout: library
-repo: rethinkdb
----
diff --git a/samples/rocket.chat.md b/samples/rocket.chat.md
deleted file mode 100644
index d11e127560..0000000000
--- a/samples/rocket.chat.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Rocket.Chat
-keywords: library, sample, Rocket.Chat
-layout: library
-repo: rocket.chat
----
diff --git a/samples/ros.md b/samples/ros.md
deleted file mode 100644
index 3b00452b91..0000000000
--- a/samples/ros.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Robot Operating System (ROS)
-keywords: library, sample, Robot Operating System, ROS
-layout: library
-repo: ros
----
diff --git a/samples/ruby.md b/samples/ruby.md
deleted file mode 100644
index 67d0396886..0000000000
--- a/samples/ruby.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ruby
-keywords: library, sample, Ruby
-layout: library
-repo: ruby
----
diff --git a/samples/scratch.md b/samples/scratch.md
deleted file mode 100644
index e94fb7cd50..0000000000
--- a/samples/scratch.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: scratch
-keywords: library, sample, scratch
-layout: library
-repo: scratch
----
diff --git a/samples/sentry.md b/samples/sentry.md
deleted file mode 100644
index 1eb3c16c73..0000000000
--- a/samples/sentry.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Sentry
-keywords: library, sample, Sentry
-layout: library
-repo: sentry
----
diff --git a/samples/silverpeas.md b/samples/silverpeas.md
deleted file mode 100644
index 0040590231..0000000000
--- a/samples/silverpeas.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Silverpeas
-keywords: library, sample, Silverpeas
-layout: library
-repo: silverpeas
----
diff --git a/samples/solr.md b/samples/solr.md
deleted file mode 100644
index 3c5f28416c..0000000000
--- a/samples/solr.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Solr
-keywords: library, sample, Solr
-layout: library
-repo: solr
----
diff --git a/samples/sonarqube.md b/samples/sonarqube.md
deleted file mode 100644
index ceaa3311c1..0000000000
--- a/samples/sonarqube.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: SonarQube
-keywords: library, sample, SonarQube
-layout: library
-repo: sonarqube
----
diff --git a/samples/sourcemage.md b/samples/sourcemage.md
deleted file mode 100644
index 9fcedf16d1..0000000000
--- a/samples/sourcemage.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Source Mage
-keywords: library, sample, Source Mage
-layout: library
-repo: sourcemage
----
diff --git a/samples/spiped.md b/samples/spiped.md
deleted file mode 100644
index ceca99ad6a..0000000000
--- a/samples/spiped.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Spiped
-keywords: library, sample, Spiped
-layout: library
-repo: spiped
----
diff --git a/samples/storm.md b/samples/storm.md
deleted file mode 100644
index 0cb4d28a22..0000000000
--- a/samples/storm.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Storm
-keywords: library, sample, Storm
-layout: library
-repo: storm
----
diff --git a/samples/swarm.md b/samples/swarm.md
deleted file mode 100644
index f82485bc85..0000000000
--- a/samples/swarm.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: swarm
-keywords: library, sample, swarm
-layout: library
-repo: swarm
----
diff --git a/samples/swift.md b/samples/swift.md
deleted file mode 100644
index e7e511ea9b..0000000000
--- a/samples/swift.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Swift
-keywords: library, sample, Swift
-layout: library
-repo: swift
----
diff --git a/samples/telegraf.md b/samples/telegraf.md
deleted file mode 100644
index a557275d56..0000000000
--- a/samples/telegraf.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Telegraf
-keywords: library, sample, Telegraf
-layout: library
-repo: telegraf
----
diff --git a/samples/thrift.md b/samples/thrift.md
deleted file mode 100644
index 702cdcd5ef..0000000000
--- a/samples/thrift.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Thrift
-keywords: library, sample, Thrift
-layout: library
-repo: thrift
----
diff --git a/samples/tomcat.md b/samples/tomcat.md
deleted file mode 100644
index 03a1ec6a48..0000000000
--- a/samples/tomcat.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Tomcat
-keywords: library, sample, Tomcat
-layout: library
-repo: tomcat
----
diff --git a/samples/tomee.md b/samples/tomee.md
deleted file mode 100644
index 7369903a86..0000000000
--- a/samples/tomee.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: TomEE
-keywords: library, sample, TomEE
-layout: library
-repo: tomee
----
diff --git a/samples/traefik.md b/samples/traefik.md
deleted file mode 100644
index e464299d07..0000000000
--- a/samples/traefik.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Træfɪk
-keywords: library, sample, Træfɪk, traefik
-layout: library
-repo: traefik
----
diff --git a/samples/ubuntu.md b/samples/ubuntu.md
deleted file mode 100644
index 7b6bfb56d9..0000000000
--- a/samples/ubuntu.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ubuntu
-keywords: library, sample, Ubuntu
-layout: library
-repo: ubuntu
----
diff --git a/samples/vault.md b/samples/vault.md
deleted file mode 100644
index 8de66ca615..0000000000
--- a/samples/vault.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Vault
-keywords: library, sample, Vault
-layout: library
-repo: vault
----
diff --git a/samples/websphere-liberty.md b/samples/websphere-liberty.md
deleted file mode 100644
index 312cfde293..0000000000
--- a/samples/websphere-liberty.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: IBM WebSphere Application Server Liberty
-keywords: library, sample, WebSphere Liberty, WebSphere, Liberty
-layout: library
-repo: websphere-liberty
----
diff --git a/samples/wordpress.md b/samples/wordpress.md
deleted file mode 100644
index d0741dd799..0000000000
--- a/samples/wordpress.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: WordPress
-keywords: library, sample, WordPress
-layout: library
-repo: wordpress
-redirect_from:
-- /compose/wordpress/
----
diff --git a/samples/xwiki.md b/samples/xwiki.md
deleted file mode 100644
index 6532715b70..0000000000
--- a/samples/xwiki.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: XWiki
-keywords: library, sample, XWiki
-layout: library
-repo: xwiki
----
diff --git a/samples/znc.md b/samples/znc.md
deleted file mode 100644
index da725968f0..0000000000
--- a/samples/znc.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: ZNC
-keywords: library, sample, ZNC
-layout: library
-repo: znc
----
diff --git a/samples/zookeeper.md b/samples/zookeeper.md
deleted file mode 100644
index 3a4627484b..0000000000
--- a/samples/zookeeper.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: ZooKeeper
-keywords: library, sample, ZooKeeper
-layout: library
-repo: zookeeper
----
diff --git a/sitemap.xml b/sitemap.xml
index 251906217a..2c319d2a37 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -12,6 +12,10 @@ layout: null
https://docs.docker.com/
{{ site.time | date_to_xmlschema }}
+{% for page in site.samples %}
+ https://docs.docker.com{{ page.url }}
+ {% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}
+{% endfor %}
{% for page in site.pages %}{% unless page.hide_from_sitemap %}
https://docs.docker.com{{ page.url }}
{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}