Bump version to v1.7.0

Signed-off-by: Jessica Frazelle <princess@docker.com>

CHANGELOG.md

@@ -4,8 +4,6 @@
 
 #### Runtime
 + Experimental feature: support for out-of-process volume plugins
-+ Experimental feature: support for out-of-process network plugins
-* Logging: syslog logging driver is available
 * The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
 * The `exec` command supports the `-u|--user` flag to specify the new process owner
 + Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Want to hack on Docker? Awesome!  We have a contributor's guide that explains
 [setting up a Docker development environment and the contribution
 process](https://docs.docker.com/project/who-written-for/). 
 
-![Contributors guide](docs/sources/static_files/contributors.png)
+![Contributors guide](docs/static_files/contributors.png)
 
 This page contains information about reporting issues as well as some tips and
 guidelines useful to experienced open source contributors. Finally, make sure

Makefile

@@ -22,11 +22,6 @@ DOCKER_ENVS := \
 BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles))
 DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)")
 
-# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
-DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
-
-# to allow `make DOCSPORT=9000 docs`
-DOCSPORT := 8000
 
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH),:$(GIT_BRANCH))
@@ -50,19 +45,6 @@ binary: build
 cross: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
 
-docs: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" mkdocs serve
-
-docs-shell: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
-
-docs-release: docs-build
-	$(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT -e DISTRIBUTION_ID \
-		-v $(CURDIR)/docs/awsconfig:/docs/awsconfig \
-		"$(DOCKER_DOCS_IMAGE)" ./release.sh
-
-docs-test: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
 
 test: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration-cli test-docker-py
@@ -85,13 +67,5 @@ shell: build
 build: bundles
 	docker build -t "$(DOCKER_IMAGE)" .
 
-docs-build:
-	cp ./VERSION docs/VERSION
-	echo "$(GIT_BRANCH)" > docs/GIT_BRANCH
-#	echo "$(AWS_S3_BUCKET)" > docs/AWS_S3_BUCKET
-	echo "$(GITCOMMIT)" > docs/GITCOMMIT
-	docker pull docs/base
-	docker build -t "$(DOCKER_DOCS_IMAGE)" docs
-
 bundles:
 	mkdir bundles

README.md

@@ -18,7 +18,7 @@ It benefits directly from the experience accumulated over several years
 of large-scale operation and support of hundreds of thousands of
 applications and databases.
 
-![Docker L](docs/sources/static_files/docker-logo-compressed.png "Docker")
+![Docker L](docs/static_files/docker-logo-compressed.png "Docker")
 
 ## Security Disclosure
 

VERSION

@@ -1 +1 @@
-1.7.0-rc3
+1.7.0-rc5

api/server/server.go

@@ -903,6 +903,7 @@ func (s *Server) postContainersCreate(version version.Version, w http.ResponseWr
 	if err != nil {
 		return err
 	}
+	adjustCpuShares(version, hostConfig)
 
 	containerId, warnings, err := s.daemon.ContainerCreate(name, config, hostConfig)
 	if err != nil {

api/server/server_linux.go

@@ -8,12 +8,21 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/docker/docker/daemon"
 	"github.com/docker/docker/pkg/sockets"
 	"github.com/docker/docker/pkg/systemd"
+	"github.com/docker/docker/pkg/version"
+	"github.com/docker/docker/runconfig"
 	"github.com/docker/libnetwork/portallocator"
 )
 
+const (
+	// See http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269
+	linuxMinCpuShares = 2
+	linuxMaxCpuShares = 262144
+)
+
 // newServer sets up the required serverClosers and does protocol specific checking.
 func (s *Server) newServer(proto, addr string) ([]serverCloser, error) {
 	var (
@@ -96,3 +105,18 @@ func allocateDaemonPort(addr string) error {
 	}
 	return nil
 }
+
+func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig) {
+	if version.LessThan("1.19") {
+		if hostConfig.CpuShares > 0 {
+			// Handle unsupported CpuShares
+			if hostConfig.CpuShares < linuxMinCpuShares {
+				logrus.Warnf("Changing requested CpuShares of %d to minimum allowed of %d", hostConfig.CpuShares, linuxMinCpuShares)
+				hostConfig.CpuShares = linuxMinCpuShares
+			} else if hostConfig.CpuShares > linuxMaxCpuShares {
+				logrus.Warnf("Changing requested CpuShares of %d to maximum allowed of %d", hostConfig.CpuShares, linuxMaxCpuShares)
+				hostConfig.CpuShares = linuxMaxCpuShares
+			}
+		}
+	}
+}

api/server/server_linux_test.go

@@ -0,0 +1,68 @@
+// +build linux
+
+package server
+
+import (
+	"testing"
+
+	"github.com/docker/docker/pkg/version"
+	"github.com/docker/docker/runconfig"
+)
+
+func TestAdjustCpuSharesOldApi(t *testing.T) {
+	apiVersion := version.Version("1.18")
+	hostConfig := &runconfig.HostConfig{
+		CpuShares: linuxMinCpuShares - 1,
+	}
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != linuxMinCpuShares {
+		t.Errorf("Expected CpuShares to be %d", linuxMinCpuShares)
+	}
+
+	hostConfig.CpuShares = linuxMaxCpuShares + 1
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != linuxMaxCpuShares {
+		t.Errorf("Expected CpuShares to be %d", linuxMaxCpuShares)
+	}
+
+	hostConfig.CpuShares = 0
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != 0 {
+		t.Error("Expected CpuShares to be unchanged")
+	}
+
+	hostConfig.CpuShares = 1024
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != 1024 {
+		t.Error("Expected CpuShares to be unchanged")
+	}
+}
+
+func TestAdjustCpuSharesNoAdjustment(t *testing.T) {
+	apiVersion := version.Version("1.19")
+	hostConfig := &runconfig.HostConfig{
+		CpuShares: linuxMinCpuShares - 1,
+	}
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != linuxMinCpuShares-1 {
+		t.Errorf("Expected CpuShares to be %d", linuxMinCpuShares-1)
+	}
+
+	hostConfig.CpuShares = linuxMaxCpuShares + 1
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != linuxMaxCpuShares+1 {
+		t.Errorf("Expected CpuShares to be %d", linuxMaxCpuShares+1)
+	}
+
+	hostConfig.CpuShares = 0
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != 0 {
+		t.Error("Expected CpuShares to be unchanged")
+	}
+
+	hostConfig.CpuShares = 1024
+	adjustCpuShares(apiVersion, hostConfig)
+	if hostConfig.CpuShares != 1024 {
+		t.Error("Expected CpuShares to be unchanged")
+	}
+}

api/server/server_windows.go

@@ -48,3 +48,6 @@ func (s *Server) AcceptConnections(d *daemon.Daemon) {
 func allocateDaemonPort(addr string) error {
 	return nil
 }
+
+func adjustCpuShares(version version.Version, hostConfig *runconfig.HostConfig) {
+}

contrib/init/openrc/docker.initd

@@ -7,7 +7,6 @@ DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log}
 DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid}
 DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker}
 DOCKER_OPTS=${DOCKER_OPTS:-}
-UNSHARE_BINARY=${UNSHARE_BINARY:-/usr/bin/unshare}
 
 start() {
 	checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
@@ -17,12 +16,11 @@ start() {
 
 	ebegin "Starting docker daemon"
 	start-stop-daemon --start --background \
-		--exec "$UNSHARE_BINARY" \
+		--exec "$DOCKER_BINARY" \
 		--pidfile "$DOCKER_PIDFILE" \
 		--stdout "$DOCKER_LOGFILE" \
 		--stderr "$DOCKER_LOGFILE" \
-		-- --mount \
-		-- "$DOCKER_BINARY" -d -p "$DOCKER_PIDFILE" \
+		-- -d -p "$DOCKER_PIDFILE" \
 		$DOCKER_OPTS
 	eend $?
 }

contrib/init/sysvinit-debian/docker

@@ -30,7 +30,6 @@ DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid
 DOCKER_LOGFILE=/var/log/$BASE.log
 DOCKER_OPTS=
 DOCKER_DESC="Docker"
-UNSHARE=${UNSHARE:-/usr/bin/unshare}
 
 # Get lsb functions
 . /lib/lsb/init-functions
@@ -100,11 +99,11 @@ case "$1" in
 		log_begin_msg "Starting $DOCKER_DESC: $BASE"
 		start-stop-daemon --start --background \
 			--no-close \
-			--exec "$UNSHARE" \
+			--exec "$DOCKER" \
 			--pidfile "$DOCKER_SSD_PIDFILE" \
 			--make-pidfile \
-			-- --mount \
-			-- "$DOCKER" -d -p "$DOCKER_PIDFILE" \
+			-- \
+				-d -p "$DOCKER_PIDFILE" \
 				$DOCKER_OPTS \
 					>> "$DOCKER_LOGFILE" 2>&1
 		log_end_msg $?

contrib/init/upstart/docker.conf

@@ -39,7 +39,7 @@ script
 	if [ -f /etc/default/$UPSTART_JOB ]; then
 		. /etc/default/$UPSTART_JOB
 	fi
-	exec unshare -m -- "$DOCKER" -d $DOCKER_OPTS
+	exec "$DOCKER" -d $DOCKER_OPTS
 end script
 
 # Don't emit "started" event until docker.sock is ready.

daemon/daemon.go

@@ -1,6 +1,7 @@
 package daemon
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -48,6 +49,7 @@ import (
 	"github.com/docker/docker/utils"
 	volumedrivers "github.com/docker/docker/volume/drivers"
 	"github.com/docker/docker/volume/local"
+	"github.com/docker/libcontainer/netlink"
 )
 
 var (
@@ -672,6 +674,8 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 	if config.Bridge.Iface != "" && config.Bridge.IP != "" {
 		return nil, fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one.")
 	}
+	setDefaultMtu(config)
+
 	if !config.Bridge.EnableIPTables && !config.Bridge.InterContainerCommunication {
 		return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
 	}
@@ -1262,3 +1266,30 @@ func (daemon *Daemon) newBaseContainer(id string) CommonContainer {
 		root:         daemon.containerRoot(id),
 	}
 }
+
+func setDefaultMtu(config *Config) {
+	// do nothing if the config does not have the default 0 value.
+	if config.Mtu != 0 {
+		return
+	}
+	config.Mtu = defaultNetworkMtu
+	if routeMtu, err := getDefaultRouteMtu(); err == nil {
+		config.Mtu = routeMtu
+	}
+}
+
+var errNoDefaultRoute = errors.New("no default route was found")
+
+// getDefaultRouteMtu returns the MTU for the default route's interface.
+func getDefaultRouteMtu() (int, error) {
+	routes, err := netlink.NetworkGetRoutes()
+	if err != nil {
+		return 0, err
+	}
+	for _, r := range routes {
+		if r.Default {
+			return r.Iface.MTU, nil
+		}
+	}
+	return 0, errNoDefaultRoute
+}

docs/Dockerfile

@@ -1,163 +1,24 @@
-#
-# See the top level Makefile in https://github.com/docker/docker for usage.
-#
-FROM docs/base:latest
-MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
+FROM docs/base:hugo
+MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-# This section ensures we pull the correct version of each
-# sub project
-ENV COMPOSE_BRANCH release
-ENV SWARM_BRANCH v0.2.0
-ENV MACHINE_BRANCH docs
-ENV DISTRIB_BRANCH docs
-ENV KITEMATIC_BRANCH master
-
-
-# TODO: need the full repo source to get the git version info
+# To get the git info for this repo
 COPY . /src
 
-# Reset the /docs dir so we can replace the theme meta with the new repo's git info
-# RUN git reset --hard
+COPY . /docs/content/engine/
 
-# Then copy the desired docs into the /docs/sources/ dir
-COPY ./sources/ /docs/sources
-
-COPY ./VERSION VERSION
-
-# adding the image spec will require Docker 1.5 and `docker build -f docs/Dockerfile .`
-#COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md
-
-# TODO: don't do this - look at merging the yml file in build.sh
-COPY ./mkdocs.yml ./s3_website.json ./release.sh ./
-
-#######################
-# Docker Distribution
-########################
-
-#ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/mkdocs.yml /docs/mkdocs-distribution.yml
-
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/notifications.png \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/registry.png \
-  /docs/sources/registry/images/
-
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/index.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/deploying.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/configuration.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storagedrivers.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/notifications.md \
-  /docs/sources/registry/
-
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/api.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/json.md \
-  /docs/sources/registry/spec/
-  
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/s3.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/azure.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/filesystem.md \
-    https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/inmemory.md \
-  /docs/sources/registry/storage-drivers/
-
-ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/auth/token.md /docs/sources/registry/spec/auth/token.md
-
-RUN sed -i.old '1s;^;no_version_dropdown: true;' \
-  /docs/sources/registry/*.md \
-  /docs/sources/registry/spec/*.md \
-  /docs/sources/registry/spec/auth/*.md \
-  /docs/sources/registry/storage-drivers/*.md 
-
-RUN sed -i.old  -e '/^<!--GITHUB/g' -e '/^IGNORES-->/g'\
-  /docs/sources/registry/*.md \
-  /docs/sources/registry/spec/*.md \
-  /docs/sources/registry/spec/auth/*.md \
-  /docs/sources/registry/storage-drivers/*.md 
-
-#######################
-# Docker Swarm
-#######################
-
-#ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/docs/mkdocs.yml /docs/mkdocs-swarm.yml
-ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/docs/index.md /docs/sources/swarm/index.md
-
-ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/discovery/README.md /docs/sources/swarm/discovery.md
-
-ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/api/README.md /docs/sources/swarm/API.md
-
-ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/scheduler/filter/README.md /docs/sources/swarm/scheduler/filter.md
-
-ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/scheduler/strategy/README.md /docs/sources/swarm/scheduler/strategy.md
-
-RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/swarm/*.md /docs/sources/swarm/scheduler/*.md
-
-#######################
-# Docker Machine
-#######################
-#ADD https://raw.githubusercontent.com/docker/machine/${MACHINE_BRANCH}/docs/mkdocs.yml /docs/mkdocs-machine.yml
-
-ADD https://raw.githubusercontent.com/docker/machine/${MACHINE_BRANCH}/docs/index.md /docs/sources/machine/index.md
-RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/machine/index.md
-
-#######################
-# Docker Compose
-#######################
-
-#ADD https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/mkdocs.yml /docs/mkdocs-compose.yml
-
-ADD https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/index.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/install.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/cli.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/yml.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/env.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/completion.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/django.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/rails.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/wordpress.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/extends.md \
-  https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/production.md \
-  /docs/sources/compose/
-
-RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/*.md
-
-#######################
-# Kitematic
-#######################
-ADD https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/faq.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/index.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/known-issues.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/minecraft-server.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/nginx-web-server.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/rethinkdb-dev-database.md \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/userguide.md \
-  /docs/sources/kitematic/
-RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/kitematic/*.md
-ADD https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/browse-images.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/change-folder.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-access-button.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-redis-container.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/cli-terminal.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/containers.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/installing.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-add-server.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-create.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-data-volume.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-login.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-map.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-port.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-restart.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/minecraft-server-address.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-2048-files.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-2048.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-create.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-data-folder.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-data-volume.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-hello-world.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-preview.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/nginx-serving-2048.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-container.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-create.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethink-ports.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/rethinkdb-preview.png \
-  https://raw.githubusercontent.com/kitematic/kitematic/${KITEMATIC_BRANCH}/docs/assets/volumes-dir.png \
-  /docs/sources/kitematic/assets/
-
-# Then build everything together, ready for mkdocs
-RUN /docs/build.sh
+# Sed to process GitHub Markdown
+# 1-2 Remove comment code from metadata block
+# 3 Remove .md extension from link text
+# 4 Change ](/ to ](/project/ in links
+# 5 Change ](word) to ](/project/word)
+# 6 Change ](../../ to ](/project/
+# 7 Change ](../ to ](/project/word)
+# 
+# 
+RUN find /docs/content/engine -type f -name "*.md" -exec sed -i.old \
+    -e '/^<!.*metadata]>/g' \
+    -e '/^<!.*end-metadata.*>/g' \
+    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
+    -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/engine\//g' \
+    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/engine\/\2/g' \
+    -e 's/\(\][(]\)\(\.\.\/\)/\1\/engine\//g' {} \;

docs/Makefile

@@ -0,0 +1,55 @@
+.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli test-docker-py validate
+
+# env vars passed through directly to Docker's build scripts
+# to allow things like `make DOCKER_CLIENTONLY=1 binary` easily
+# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
+DOCKER_ENVS := \
+	-e BUILDFLAGS \
+	-e DOCKER_CLIENTONLY \
+	-e DOCKER_EXECDRIVER \
+	-e DOCKER_GRAPHDRIVER \
+	-e TESTDIRS \
+	-e TESTFLAGS \
+	-e TIMEOUT
+# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
+
+# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
+DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
+
+# to allow `make DOCSPORT=9000 docs`
+DOCSPORT := 8000
+
+# Get the IP ADDRESS
+DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
+HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
+HUGO_BIND_IP=0.0.0.0
+
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
+DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
+DOCKER_DOCS_IMAGE := docs-base$(if $(GIT_BRANCH),:$(GIT_BRANCH))
+
+
+DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
+
+# for some docs workarounds (see below in "docs-build" target)
+GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
+
+default: docs
+
+docs: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
+
+docs-draft: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
+
+
+docs-shell: docs-build
+	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
+
+
+docs-build:
+#	( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs ./ > ./changed-files
+#	echo "$(GIT_BRANCH)" > GIT_BRANCH
+#	echo "$(AWS_S3_BUCKET)" > AWS_S3_BUCKET
+#	echo "$(GITCOMMIT)" > GITCOMMIT
+	docker build -t "$(DOCKER_DOCS_IMAGE)" .

docs/README.md

@@ -1,6 +1,12 @@
+<!--[metadata]>
++++
+draft = true
++++
+<![end-metadata]-->
+
 # Docker Documentation
 
-The source for Docker documentation is in this directory under `sources/`. Our
+The source for Docker documentation is in this directory. Our
 documentation uses extended Markdown, as implemented by
 [MkDocs](http://mkdocs.org).  The current release of the Docker documentation
 resides on [https://docs.docker.com](https://docs.docker.com).
@@ -54,7 +60,7 @@ own.
 	release. It also allows docs maintainers to easily cherry-pick your changes
 	into the `docs` release branch. 
 
-4. Modify existing or add new `.md` files to the `docs/sources` directory.
+4. Modify existing or add new `.md` files to the `docs` directory.
 
 	If you add a new document (`.md`) file, you must also add it to the
 	appropriate section of the `docs/mkdocs.yml` file in this repository.
@@ -107,7 +113,7 @@ links that are referenced in the documentation&mdash;there should be none.
 ## Style guide
 
 If you have questions about how to write for Docker's documentation, please see
-the [style guide](sources/project/doc-style.md). The style guide provides
+the [style guide](project/doc-style.md). The style guide provides
 guidance about grammar, syntax, formatting, styling, language, or tone. If
 something isn't clear in the guide, please submit an issue to let us know or
 submit a pull request to help us improve it.

docs/articles/ambassador_pattern_linking.md

@@ -1,6 +1,13 @@
-page_title: Link via an ambassador container
-page_description: Using the Ambassador pattern to abstract (network) services
-page_keywords: Examples, Usage, links, docker, documentation, examples, names, name, container naming
+<!--[metadata]>
++++
+title = "Link via an ambassador container"
+description = "Using the Ambassador pattern to abstract (network) services"
+keywords = ["Examples, Usage, links, docker, documentation, examples, names, name,  container naming"]
+[menu.main]
+parent = "smn_administrate"
+weight = 6
++++
+<![end-metadata]-->
 
 # Link via an ambassador container
 

docs/articles/b2d_volume_resize.md

@@ -1,6 +1,12 @@
-page_title: Resizing a Boot2Docker volume	
-page_description: Resizing a Boot2Docker volume in VirtualBox with GParted
-page_keywords: boot2docker, volume, virtualbox
+<!--[metadata]>
++++
+title = "Resizing a Boot2Docker volume	"
+description = "Resizing a Boot2Docker volume in VirtualBox with GParted"
+keywords = ["boot2docker, volume,  virtualbox"]
+[menu.main]
+parent = "smn_win_osx"
++++
+<![end-metadata]-->
 
 # Getting “no space left on device” errors with Boot2Docker?
 

docs/articles/baseimages.md

@@ -1,6 +1,12 @@
-page_title: Create a base image
-page_description: How to create base images
-page_keywords: Examples, Usage, base image, docker, documentation, examples
+<!--[metadata]>
++++
+title = "Create a base image"
+description = "How to create base images"
+keywords = ["Examples, Usage, base image, docker, documentation,  examples"]
+[menu.main]
+parent = "smn_images"
++++
+<![end-metadata]-->
 
 # Create a base image
 

docs/articles/basics.md

@@ -1,8 +1,14 @@
-page_title: First steps with Docker
-page_description: Common usage and commands
-page_keywords: Examples, Usage, basic commands, docker, documentation, examples
+<!--[metadata]>
++++
+title = "Get started with containers"
+description = "Common usage and commands"
+keywords = ["Examples, Usage, basic commands, docker, documentation,  examples"]
+[menu.main]
+parent = "smn_containers"
++++
+<![end-metadata]-->
 
-# First steps with Docker
+# "Get started with containers
 
 This guide assumes you have a working installation of Docker. To check
 your Docker install, run the following command:

docs/articles/certificates.md

@@ -1,6 +1,12 @@
-page_title: Using certificates for repository client verification
-page_description: How to set up and use certificates with a registry to verify access
-page_keywords: Usage, registry, repository, client, root, certificate, docker, apache, ssl, tls, documentation, examples, articles, tutorials
+<!--[metadata]>
++++
+title = "Using certificates for repository client verification"
+description = "How to set up and use certificates with a registry to verify access"
+keywords = ["Usage, registry, repository, client, root, certificate, docker, apache, ssl, tls, documentation, examples, articles,  tutorials"]
+[menu.main]
+parent = "smn_registry"
++++
+<![end-metadata]-->
 
 # Using certificates for repository client verification
 

docs/articles/cfengine_process_management.md

@@ -1,6 +1,12 @@
-page_title: Process management with CFEngine
-page_description: Managing containerized processes with CFEngine
-page_keywords: cfengine, process, management, usage, docker, documentation
+<!--[metadata]>
++++
+title = "Process management with CFEngine"
+description = "Managing containerized processes with CFEngine"
+keywords = ["cfengine, process, management, usage, docker,  documentation"]
+[menu.main]
+parent = "smn_third_party"
++++
+<![end-metadata]-->
 
 # Process management with CFEngine
 

docs/articles/chef.md

@@ -1,6 +1,12 @@
-page_title: Using Chef
-page_description: Installation and using Docker via Chef
-page_keywords: chef, installation, usage, docker, documentation
+<!--[metadata]>
++++
+title = "Using Chef"
+description = "Installation and using Docker via Chef"
+keywords = ["chef, installation, usage, docker,  documentation"]
+[menu.main]
+parent = "smn_third_party"
++++
+<![end-metadata]-->
 
 # Using Chef
 

docs/articles/configuring.md

@@ -1,6 +1,13 @@
-page_title: Configuring and running Docker
-page_description: Configuring and running the Docker daemon on various distributions
-page_keywords: docker, daemon, configuration, running, process managers
+<!--[metadata]>
++++
+title = "Configuring and running Docker"
+description = "Configuring and running the Docker daemon on various distributions"
+keywords = ["docker, daemon, configuration, running,  process managers"]
+[menu.main]
+parent = "smn_administrate"
+weight = 3
++++
+<![end-metadata]-->
 
 # Configuring and running Docker on various distributions
 

docs/articles/dockerfile_best-practices.md

@@ -1,6 +1,12 @@
-page_title: Best practices for writing Dockerfiles
-page_description: Hints, tips and guidelines for writing clean, reliable Dockerfiles
-page_keywords: Examples, Usage, base image, docker, documentation, dockerfile, best practices, hub, official repo
+<!--[metadata]>
++++
+title = "Best practices for writing Dockerfiles"
+description = "Hints, tips and guidelines for writing clean, reliable Dockerfiles"
+keywords = ["Examples, Usage, base image, docker, documentation, dockerfile, best practices, hub,  official repo"]
+[menu.main]
+parent = "smn_images"
++++
+<![end-metadata]-->
 
 # Best practices for writing Dockerfiles
 

docs/articles/dsc.md

@@ -1,6 +1,12 @@
-page_title: PowerShell DSC Usage
-page_description: Using DSC to configure a new Docker host
-page_keywords: powershell, dsc, installation, usage, docker, documentation
+<!--[metadata]>
++++
+title = "PowerShell DSC Usage"
+description = "Using DSC to configure a new Docker host"
+keywords = ["powershell, dsc, installation, usage, docker,  documentation"]
+[menu.main]
+parent = "smn_win_osx"
++++
+<![end-metadata]-->
 
 # Using PowerShell DSC
 

docs/articles/host_integration.md

@@ -1,6 +1,13 @@
-page_title: Automatically start containers
-page_description: How to generate scripts for upstart, systemd, etc.
-page_keywords: systemd, upstart, supervisor, docker, documentation, host integration
+<!--[metadata]>
++++
+title = "Automatically start containers"
+description = "How to generate scripts for upstart, systemd, etc."
+keywords = ["systemd, upstart, supervisor, docker, documentation,  host integration"]
+[menu.main]
+parent = "smn_containers"
+weight = 99
++++
+<![end-metadata]-->
 
 # Automatically start containers
 

docs/articles/https.md

@@ -1,8 +1,15 @@
-page_title: Protecting the Docker daemon socket with HTTPS
-page_description: How to setup and run Docker with HTTPS
-page_keywords: docker, docs, article, example, https, daemon, tls, ca, certificate
+<!--[metadata]>
++++
+title = "Protect the Docker daemon socket"
+description = "How to setup and run Docker with HTTPS"
+keywords = ["docker, docs, article, example, https, daemon, tls, ca,  certificate"]
+[menu.main]
+parent = "smn_administrate"
+weight = 5
++++
+<![end-metadata]-->
 
-# Protecting the Docker daemon socket with HTTPS
+# Protect the Docker daemon socket
 
 By default, Docker runs via a non-networked Unix socket. It can also
 optionally communicate using a HTTP socket.

docs/articles/https/README.md

@@ -9,7 +9,7 @@ so my process is
 
 $ boot2docker ssh
 $$ git clone https://github.com/docker/docker
-$$ cd docker/docs/sources/articles/https
+$$ cd docker/docs/articles/https
 $$ make cert
 lots of things to see and manually answer, as openssl wants to be interactive
 **NOTE:** make sure you enter the hostname (`boot2docker` in my case) when prompted for `Computer Name`)
@@ -18,7 +18,7 @@ $$ sudo make run
 start another terminal
 
 $ boot2docker ssh
-$$ cd docker/docs/sources/articles/https
+$$ cd docker/docs/articles/https
 $$ make client
 
 the last will connect first with `--tls` and then with `--tlsverify`

docs/articles/networking.md

@@ -1,10 +1,16 @@
-page_title: Network configuration
-page_description: Docker networking
-page_keywords: network, networking, bridge, docker, documentation
+<!--[metadata]>
++++
+title = "Network configuration"
+description = "Docker networking"
+keywords = ["network, networking, bridge, docker,  documentation"]
+[menu.main]
+parent= "smn_administrate"
++++
+<![end-metadata]-->
 
 # Network configuration
 
-## TL;DR
+## Summary
 
 When Docker starts, it creates a virtual interface named `docker0` on
 the host machine.  It randomly chooses an address and subnet from the

docs/articles/puppet.md

@@ -1,6 +1,12 @@
-page_title: Using Puppet
-page_description: Installing and using Puppet
-page_keywords: puppet, installation, usage, docker, documentation
+<!--[metadata]>
++++
+title = "Using Puppet"
+description = "Installing and using Puppet"
+keywords = ["puppet, installation, usage, docker,  documentation"]
+[menu.main]
+parent = "smn_third_party"
++++
+<![end-metadata]-->
 
 # Using Puppet
 

docs/articles/registry_mirror.md

@@ -1,6 +1,12 @@
-page_title: Run a local registry mirror
-page_description: How to set up and run a local registry mirror
-page_keywords: docker, registry, mirror, examples
+<!--[metadata]>
++++
+title = "Run a local registry mirror"
+description = "How to set up and run a local registry mirror"
+keywords = ["docker, registry, mirror,  examples"]
+[menu.main]
+parent = "smn_registry"
++++
+<![end-metadata]-->
 
 # Run a local registry mirror
 

docs/articles/runmetrics.md

@@ -1,6 +1,13 @@
-page_title: Runtime metrics
-page_description: Measure the behavior of running containers
-page_keywords: docker, metrics, CPU, memory, disk, IO, run, runtime
+<!--[metadata]>
++++
+title = "Runtime metrics"
+description = "Measure the behavior of running containers"
+keywords = ["docker, metrics, CPU, memory, disk, IO, run,  runtime"]
+[menu.main]
+parent = "smn_administrate"
+weight = 4
++++
+<![end-metadata]-->
 
 # Runtime metrics
 

docs/articles/security.md

@@ -1,6 +1,13 @@
-page_title: Docker security
-page_description: Review of the Docker Daemon attack surface
-page_keywords: Docker, Docker documentation, security
+<!--[metadata]>
++++
+title = "Docker security"
+description = "Review of the Docker Daemon attack surface"
+keywords = ["Docker, Docker documentation,  security"]
+[menu.main]
+parent = "smn_administrate"
+weight = 2
++++
+<![end-metadata]-->
 
 # Docker security
 

docs/articles/systemd.md

@@ -1,8 +1,15 @@
-page_title: Controlling and configuring Docker using systemd
-page_description: Controlling and configuring Docker using systemd
-page_keywords: docker, daemon, systemd, configuration
+<!--[metadata]>
++++
+title = "Control and configure Docker with systemd"
+description = "Controlling and configuring Docker using systemd"
+keywords = ["docker, daemon, systemd,  configuration"]
+[menu.main]
+parent = "smn_administrate"
+weight = 7
++++
+<![end-metadata]-->
 
-# Controlling and configuring Docker using systemd
+# Control and configure Docker with systemd
 
 Many Linux distributions use systemd to start the Docker daemon. This document
 shows a few examples of how to customise Docker's settings.

docs/articles/using_supervisord.md

@@ -1,6 +1,12 @@
-page_title: Using Supervisor with Docker
-page_description: How to use Supervisor process management with Docker
-page_keywords: docker, supervisor, process management
+<!--[metadata]>
++++
+title = "Using Supervisor with Docker"
+description = "How to use Supervisor process management with Docker"
+keywords = ["docker, supervisor,  process management"]
+[menu.main]
+parent = "smn_third_party"
++++
+<![end-metadata]-->
 
 # Using Supervisor with Docker
 

docs/docker-hub/accounts.md

@@ -1,6 +1,12 @@
-page_title: Accounts on Docker Hub
-page_description: Docker Hub accounts
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
+<!--[metadata]>
++++
+title = "Accounts on Docker Hub"
+description = "Docker Hub accounts"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Accounts on Docker Hub
 

docs/docker-hub/builds.md

@@ -1,6 +1,12 @@
-page_title: Automated Builds on Docker Hub
-page_description: Docker Hub Automated Builds
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, trusted, builds, trusted builds, automated builds
+<!--[metadata]>
++++
+title = "Automated Builds on Docker Hub"
+description = "Docker Hub Automated Builds"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, trusted, builds, trusted builds,  automated builds"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Automated Builds on Docker Hub
 

docs/docker-hub/home.md

@@ -1,6 +1,12 @@
-page_title: The Docker Hub Registry help
-page_description: The Docker Registry help documentation home
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
+<!--[metadata]>
++++
+title = "The Docker Hub Registry help"
+description = "The Docker Registry help documentation home"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs,  documentation"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # The Docker Hub Registry help
 

docs/docker-hub/index.md

@@ -1,6 +1,12 @@
-page_title: The Docker Hub help
-page_description: The Docker Help documentation home
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, accounts, organizations, repositories, groups
+<!--[metadata]>
++++
+title = "The Docker Hub help"
+description = "The Docker Help documentation home"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, accounts, organizations, repositories,  groups"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Docker Hub
 

docs/docker-hub/official_repos.md

@@ -1,6 +1,12 @@
-page_title: Official Repositories on Docker Hub
-page_description: Guidelines for Official Repositories on Docker Hub
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, official, image, documentation
+<!--[metadata]>
++++
+title = "Official Repositories on Docker Hub"
+description = "Guidelines for Official Repositories on Docker Hub"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, official, image,  documentation"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Official Repositories on Docker Hub
 

docs/docker-hub/repos.md

@@ -1,6 +1,12 @@
-page_title: Your Repositories on Docker Hub
-page_description: Your Repositories on Docker Hub
-page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs, documentation
+<!--[metadata]>
++++
+title = "Your Repositories on Docker Hub"
+description = "Your Repositories on Docker Hub"
+keywords = ["Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs,  documentation"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Your Hub repositories
 

docs/docker-hub/userguide.md

@@ -1,6 +1,12 @@
-page_title: Docker Hub user guide
-page_description: Docker Hub user guide
-page_keywords: Docker, docker, registry, Docker Hub, docs, documentation
+<!--[metadata]>
++++
+title = "Docker Hub user guide"
+description = "Docker Hub user guide"
+keywords = ["Docker, docker, registry, Docker Hub, docs,  documentation"]
+[menu.main]
+parent = "smn_pubhub"
++++
+<![end-metadata]-->
 
 # Using the Docker Hub
 

docs/examples/apt-cacher-ng.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing an apt-cacher-ng service
-page_description: Installing and running an apt-cacher-ng service
-page_keywords: docker, example, package installation, networking, debian, ubuntu
+<!--[metadata]>
++++
+title = "Dockerizing an apt-cacher-ng service"
+description = "Installing and running an apt-cacher-ng service"
+keywords = ["docker, example, package installation, networking, debian,  ubuntu"]
+[menu.main]
+parent = "smn_applied"
++++
+<![end-metadata]-->
 
 # Dockerizing an apt-cacher-ng service
 

docs/examples/couchdb_data_volumes.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing a CouchDB service
-page_description: Sharing data between 2 couchdb databases
-page_keywords: docker, example, package installation, networking, couchdb, data volumes
+<!--[metadata]>
++++
+title = "Dockerizing a CouchDB service"
+description = "Sharing data between 2 couchdb databases"
+keywords = ["docker, example, package installation, networking, couchdb,  data volumes"]
+[menu.main]
+parent = "smn_remoteapi"
++++
+<![end-metadata]-->
 
 # Dockerizing a CouchDB service
 

docs/examples/mongodb.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing MongoDB
-page_description: Creating a Docker image with MongoDB pre-installed using a Dockerfile and sharing the image on Docker Hub
-page_keywords: docker, dockerize, dockerizing, article, example, docker.io, platform, package, installation, networking, mongodb, containers, images, image, sharing, dockerfile, build, auto-building, virtualization, framework
+<!--[metadata]>
++++
+title = "Dockerizing MongoDB"
+description = "Creating a Docker image with MongoDB pre-installed using a Dockerfile and sharing the image on Docker Hub"
+keywords = ["docker, dockerize, dockerizing, article, example, docker.io, platform, package, installation, networking, mongodb, containers, images, image, sharing, dockerfile, build, auto-building, virtualization,  framework"]
+[menu.main]
+parent = "smn_applied"
++++
+<![end-metadata]-->
 
 # Dockerizing MongoDB
 

docs/examples/nodejs_web_app.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing a Node.js web app
-page_description: Installing and running a Node.js app with Docker
-page_keywords: docker, example, package installation, node, centos
+<!--[metadata]>
++++
+title = "Dockerizing a Node.js web app"
+description = "Installing and running a Node.js app with Docker"
+keywords = ["docker, example, package installation, node,  centos"]
+[menu.main]
+parent = "smn_applied"
++++
+<![end-metadata]-->
 
 # Dockerizing a Node.js web app
 

docs/examples/postgresql_service.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing PostgreSQL
-page_description: Running and installing a PostgreSQL service
-page_keywords: docker, example, package installation, postgresql
+<!--[metadata]>
++++
+title = "Dockerizing PostgreSQL"
+description = "Running and installing a PostgreSQL service"
+keywords = ["docker, example, package installation,  postgresql"]
+[menu.main]
+parent = "smn_applied"
++++
+<![end-metadata]-->
 
 # Dockerizing PostgreSQL
 

docs/examples/running_redis_service.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing a Redis service
-page_description: Installing and running an redis service
-page_keywords: docker, example, package installation, networking, redis
+<!--[metadata]>
++++
+title = "Dockerizing a Redis service"
+description = "Installing and running an redis service"
+keywords = ["docker, example, package installation, networking,  redis"]
+[menu.main]
+parent = "smn_applied"
++++
+<![end-metadata]-->
 
 # Dockerizing a Redis service
 

docs/examples/running_riak_service.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing a Riak service
-page_description: Build a Docker image with Riak pre-installed
-page_keywords: docker, example, package installation, networking, riak
+<!--[metadata]>
++++
+title = "Dockerizing a Riak service"
+description = "Build a Docker image with Riak pre-installed"
+keywords = ["docker, example, package installation, networking,  riak"]
+[menu.main]
+parent = "smn_apps_servs"
++++
+<![end-metadata]-->
 
 # Dockerizing a Riak service
 

docs/examples/running_ssh_service.md

@@ -1,6 +1,12 @@
-page_title: Dockerizing an SSH service
-page_description: Installing and running an SSHd service on Docker
-page_keywords: docker, example, package installation, networking
+<!--[metadata]>
++++
+title = "Dockerizing an SSH service"
+description = "Installing and running an SSHd service on Docker"
+keywords = ["docker, example, package installation,  networking"]
+[menu.main]
+parent = "smn_apps_servs"
++++
+<![end-metadata]-->
 
 # Dockerizing an SSH daemon service