Bump version to v1.7.0

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

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 #### 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/static_files/contributors.png)
+![Contributors guide](docs/sources/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,6 +22,11 @@ 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))
@@ -45,6 +50,19 @@ 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
@@ -67,5 +85,13 @@ 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/static_files/docker-logo-compressed.png "Docker")
+![Docker L](docs/sources/static_files/docker-logo-compressed.png "Docker")
 
 ## Security Disclosure
 

VERSION

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

api/server/server.go

@@ -903,7 +903,6 @@ 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,21 +8,12 @@ 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 (
@@ -105,18 +96,3 @@ 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

@@ -1,68 +0,0 @@
-// +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,6 +48,3 @@ 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,6 +7,7 @@ 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"
@@ -16,11 +17,12 @@ start() {
 
 	ebegin "Starting docker daemon"
 	start-stop-daemon --start --background \
-		--exec "$DOCKER_BINARY" \
+		--exec "$UNSHARE_BINARY" \
 		--pidfile "$DOCKER_PIDFILE" \
 		--stdout "$DOCKER_LOGFILE" \
 		--stderr "$DOCKER_LOGFILE" \
-		-- -d -p "$DOCKER_PIDFILE" \
+		-- --mount \
+		-- "$DOCKER_BINARY" -d -p "$DOCKER_PIDFILE" \
 		$DOCKER_OPTS
 	eend $?
 }

contrib/init/sysvinit-debian/docker

@@ -30,6 +30,7 @@ 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
@@ -99,11 +100,11 @@ case "$1" in
 		log_begin_msg "Starting $DOCKER_DESC: $BASE"
 		start-stop-daemon --start --background \
 			--no-close \
-			--exec "$DOCKER" \
+			--exec "$UNSHARE" \
 			--pidfile "$DOCKER_SSD_PIDFILE" \
 			--make-pidfile \
-			-- \
-				-d -p "$DOCKER_PIDFILE" \
+			-- --mount \
+			-- "$DOCKER" -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 "$DOCKER" -d $DOCKER_OPTS
+	exec unshare -m -- "$DOCKER" -d $DOCKER_OPTS
 end script
 
 # Don't emit "started" event until docker.sock is ready.

daemon/daemon.go

@@ -1,7 +1,6 @@
 package daemon
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -49,7 +48,6 @@ 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 (
@@ -674,8 +672,6 @@ 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.")
 	}
@@ -1266,30 +1262,3 @@ 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,13 +1,163 @@
-FROM docs/base:hugo
-MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
+#
+# See the top level Makefile in https://github.com/docker/docker for usage.
+#
+FROM docs/base:latest
+MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
 
-# To get the git info for this repo
+# 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
 COPY . /src
 
-COPY . /docs/content/
+# Reset the /docs dir so we can replace the theme meta with the new repo's git info
+# RUN git reset --hard
 
-WORKDIR /docs/content
+# Then copy the desired docs into the /docs/sources/ dir
+COPY ./sources/ /docs/sources
 
-RUN /docs/content/touch-up.sh
+COPY ./VERSION VERSION
 
-WORKDIR /docs
+# 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

docs/Makefile

@@ -1,55 +0,0 @@
-.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,12 +1,6 @@
-<!--[metadata]>
-+++
-draft = true
-+++
-<![end-metadata]-->
-
 # Docker Documentation
 
-The source for Docker documentation is in this directory. Our
+The source for Docker documentation is in this directory under `sources/`. 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).
@@ -60,7 +54,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` directory.
+4. Modify existing or add new `.md` files to the `docs/sources` 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.
@@ -113,7 +107,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](project/doc-style.md). The style guide provides
+the [style guide](sources/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/installation/centos.md

@@ -1,196 +0,0 @@
-<!--[metadata]>
-+++
-title = "Installation on CentOS"
-description = "Instructions for installing Docker on CentOS"
-keywords = ["Docker, Docker documentation, requirements, linux, centos, epel, docker.io,  docker-io"]
-[menu.main]
-parent = "smn_linux"
-+++
-<![end-metadata]-->
-
-# CentOS
-
-Docker is supported on the following versions of CentOS:
-
-* CentOS 7.X 
-* CentOS 6.5 or higher 
-
-Installation on other binary compatible EL6/EL7 distributions such as Scientific
-Linux might succeed, but Docker does not test or support Docker on these
-distributions.
-
-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using CentOS-managed packages, consult your
-CentOS documentation.
-
-## Prerequisites
-
-Docker requires a 64-bit installation regardless of your CentOS version. Also,
-your kernel must be 3.10 at minimum. CentOS 7 runs the 3.10 kernel, 6.5 does
-not. We make an exception for CentOS 6.5. To run Docker on
-[CentOS-6.5](https://www.centos.org) or later, you need kernel 2.6.32-431 or
-higher. 
-
-To check your current kernel version, open a terminal and use `uname -r` to
-display your kernel version:
-
-    $ uname -r 
-    2.6.32-431.el6.x86_64
-
-Finally, is it recommended that you fully update your system. Please keep in
-mind that CentOS 6 should be fully patched to fix any potential kernel bugs. Any
-reported kernel bugs may have already been fixed on the latest kernel packages 
-
-## Install
-
-You use the same installation procedure for all versions of CentOS,
-only the package you install differs. There are two packages to choose from:
-
-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>6.5 and  higher</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm</a>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm">
-   https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm</a>
-    <p>
-    </p>
-    </td>
-  </tr>
-  <tr>
-    <td>7.X</td>
-    <td>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm</a>   
-    </p>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm</a>   
-    </p>
-    </td>
-  </tr>
-</table>
-
-
-This procedure depicts an installation on version 6.5. If you are installing on
-7.X, substitute that package for your installation. 
-
-1. Log into your machine as a user with `sudo` or `root` privileges.
-
-2. Make sure your existing packages are up-to-date.
-
-		$ sudo yum update
-		
-3. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm
-
-4. Use `yum` to install the package.
-
-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-1.el6.x86_64.rpm
-
-5. Start the Docker daemon.
-
-		$ sudo service docker start
-
-6. Verify `docker` is installed correctly by running a test image in a container.
-
-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.0cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
-
-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
-
-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
-
-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
-
-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
-
-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
-
->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
-
-To create the `docker` group and add your user:
-
-1. Log into Centos as a user with `sudo` privileges.
-
-2. Create the `docker` group and add your user.
-
-    `sudo usermod -aG docker your_username`
-
-3. Log out and log back in.
-
-    This ensures your user is running with the correct permissions.
-
-4. Verify your work by running `docker` without `sudo`.
-
-		$ docker run hello-world
- 
-## Start the docker daemon at boot
-
-To ensure Docker starts when you boot your system, do the following:
-
-      $ sudo chkconfig docker on
-
-If you need to add an HTTP Proxy, set a different directory or partition for the
-Docker runtime files, or make other customizations, read our Systemd article to
-learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
-
-
-## Uninstall
-
-You can uninstall the Docker software with `yum`.  
-
-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-1.el6
-																																								 @/docker-engine-1.7.0-1.el6.x86_64.rpm
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user-created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes, run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.

docs/installation/fedora.md

@@ -1,232 +0,0 @@
-<!--[metadata]>
-+++
-title = "Installation on Fedora"
-description = "Instructions for installing Docker on Fedora."
-keywords = ["Docker, Docker documentation, Fedora, requirements,  linux"]
-[menu.main]
-parent = "smn_linux"
-+++
-<![end-metadata]-->
-
-# Fedora
-
-Docker is supported on the following versions of Fedora:
-
-- Fedora 20 
-- Fedora 21
-- Fedora 22 
-
-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using Fedora-managed packages, consult your
-Fedora release documentation for information on Fedora's Docker support.
-
-##Prerequisites
-
-Docker requires a 64-bit installation regardless of your Fedora version. Also, your kernel must be 3.10 at minimum. To check your current kernel
-version, open a terminal and use `uname -r` to display your kernel version:
-
-    $ uname -r 
-    3.19.5-100.fc20.x86_64
-
-If your kernel is at a older version, you must update it.
-
-Finally, is it recommended that you fully update your system. Please keep in
-mind that your system should be fully patched to fix any potential kernel bugs. Any
-reported kernel bugs may have already been fixed on the latest kernel packages 
-
-
-## Install
-
-You use the same installation procedure for all versions of Fedora,
-only the package you install differs. There are two packages to choose from:
-
-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>Fedora 20</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-20/RPMS/x86_64/docker-engine-1.7.0-1.fc20.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-20/RPMS/x86_64/docker-engine-1.7.0-1.fc20.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-20/SRPMS/docker-engine-1.7.0-1.fc20.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-20/SRPMS/docker-engine-1.7.0-1.fc20.src.rpm/a>
-        </p>
-    </td>
-  </tr>
-  <tr>
-    <td>Fedora 21</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-21/RPMS/x86_64/docker-engine-1.7.0-1.fc21.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-21/RPMS/x86_64/docker-engine-1.7.0-1.fc21.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-21/SRPMS/docker-engine-1.7.0-1.fc21.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-21/SRPMS/docker-engine-1.7.0-1.fc21.src.rpm/a>
-        </p>
-    </td>
-  </tr>
-   <tr>
-    <td>Fedora 22</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-22/RPMS/x86_64/docker-engine-1.7.0-1.fc22.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-22/RPMS/x86_64/docker-engine-1.7.0-1.fc22.x86_64.rpm</a>
-        </p>
-    </td>
-        <p>
-    <a href="https://get.docker.com/rpm/1.7.0/fedora-22/SRPMS/docker-engine-1.7.0-1.fc22.src.rpm">
-    https://get.docker.com/rpm/1.7.0/fedora-22/SRPMS/docker-engine-1.7.0-1.fc22.src.rpm/a>
-        </p>
-    </td>
-  </tr> 
-</table>
-
-
-This procedure depicts an installation on version 21. If you are installing on
-20 or 22, substitute that package for your installation. 
-
-1. Log into your machine as a user with `sudo` or `root` privileges.
-
-2. Make sure you don't have an older version of Docker installed.
-
-		$ yum list installed | grep docker
-	  
-	If you have an older version, remove it using the `yum -y remove <packagename>` command.
-
-3. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL https://url_to_package/docker-engine-1.7.0-0.1.fc21.x86_64.rpm
-
-4. Use `yum` to install the package.
-
-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-0.1.fc21.x86_64.rpm
-
-5. Start the Docker daemon.
-
-		$ sudo service docker start
-
-6. Verify `docker` is installed correctly by running a test image in a container.
-
-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
-
-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
-
-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
-
-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
-
-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
-
-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
-
->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
-
-To create the `docker` group and add your user:
-
-1. Log into your system as a user with `sudo` privileges.
-
-2. Create the `docker` group and add your user.
-
-    `sudo usermod -aG docker your_username`
-
-3. Log out and log back in.
-
-    This ensures your user is running with the correct permissions.
-
-4. Verify your work by running `docker` without `sudo`.
-
-        $ docker run hello-world
-				Unable to find image 'hello-world:latest' locally
-				latest: Pulling from hello-world
-				a8219747be10: Pull complete 
-				91c95931e552: Already exists 
-				hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-				Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-				Status: Downloaded newer image for hello-world:latest
-				Hello from Docker.
-				This message shows that your installation appears to be working correctly.
-
-				To generate this message, Docker took the following steps:
-				 1. The Docker client contacted the Docker daemon.
-				 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-						(Assuming it was not already locally available.)
-				 3. The Docker daemon created a new container from that image which runs the
-						executable that produces the output you are currently reading.
-				 4. The Docker daemon streamed that output to the Docker client, which sent it
-						to your terminal.
-
-				To try something more ambitious, you can run an Ubuntu container with:
-				 $ docker run -it ubuntu bash
-
-				For more examples and ideas, visit:
-				 http://docs.docker.com/userguide/
- 
-## Start the docker daemon at boot
-
-To ensure Docker starts when you boot your system, do the following:
-
-    $ sudo chkconfig docker on
-
-If you need to add an HTTP Proxy, set a different directory or partition for the
-Docker runtime files, or make other customizations, read our Systemd article to
-learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
-
-
-## Uninstall
-
-You can uninstall the Docker software with `yum`.  
-
-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-0.1.fc20
-																																								 @/docker-engine-1.7.0-0.1.fc20.el6.x86_64
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user-created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes, run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.

docs/installation/rhel.md

@@ -1,189 +0,0 @@
-<!--[metadata]>
-+++
-title = "Installation on Red Hat Enterprise Linux"
-description = "Instructions for installing Docker on Red Hat Enterprise Linux."
-keywords = ["Docker, Docker documentation, requirements, linux,  rhel"]
-[menu.main]
-parent = "smn_linux"
-+++
-<![end-metadata]-->
-
-# Red Hat Enterprise Linux
-
-Docker is supported on the following versions of RHEL:
-
-- Red Hat Enterprise Linux 7 
-- Red Hat Enterprise Linux 6.6 or later
-
-This page instructs you to install using Docker-managed release packages and
-installation mechanisms. Using these packages ensures you get the latest release
-of Docker. If you wish to install using Red Hat-managed packages, consult your
-Red Hat release documentation for information on Red Hat's Docker support.
-
-## Prerequisites
-
-Docker requires a 64-bit installation regardless of your Red Hat version. Docker
-requires that your kernel must be 3.10 at minimum. Red Hat 7 runs the 3.10
-kernel, 6.6 does not. We make an exception for Red Hat 6.6. To run Docker on
-[Red Hat-6.6](http://www.centos.org) or later, you need kernel 2.6.32-431 or
-higher. 
-
-To check your current kernel version, open a terminal and use `uname -r` to
-display your kernel version:
-
-    $ uname -r 
-    3.10.0-229.el7.x86_64
-
-Finally, is it recommended that you fully update your system. Please keep in
-mind that your system should be fully patched to fix any potential kernel bugs.
-Any reported kernel bugs may have already been fixed on the latest kernel
-packages 
-
-
-## Install
-
-You use the same installation procedure for all versions of Red Hat Enterprise,
-only the package you install differs.  There are two packages to choose from:
-
-<table>
-  <tr>
-    <th>Version</th>
-    <th>Package name</th>
-  </tr>
-  <tr>
-    <td>6.6 and  higher</td>
-    <td>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-6/RPMS/x86_64/docker-engine-1.7.0-1.el6.x86_64.rpm</a>
-    <p>
-    <a href="https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm">
-   https://get.docker.com/rpm/1.7.0/centos-6/SRPMS/docker-engine-1.7.0-1.el6.src.rpm</a>
-    <p>
-    </p>
-    </td>
-  </tr>
-  <tr>
-    <td>7.X</td>
-    <td>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/RPMS/x86_64/docker-engine-1.7.0-1.el7.centos.x86_64.rpm</a>   
-    </p>
-    <p>
-     <a href="https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm">
-    https://get.docker.com/rpm/1.7.0/centos-7/SRPMS/docker-engine-1.7.0-1.el7.centos.src.rpm</a>   
-    </p>
-    </td>
-  </tr>
-</table>
-
-This procedure depicts an installation on version 6.6.  If you are installing on
-7.X, substitute that package for your installation. 
-
-1. Log into your machine as a user with `sudo` or `root` privileges.
-
-2. Download the Docker RPM to the current directory.
-		
-		$ curl -O -sSL http://get.docker.com/docker/1.7.0/rpms/centos-6/RPMS/x86_64/docker-engine-1.7.0-0.1.el6.x86_64.rpm
-
-3. Use `yum` to install the package.
-
-		$ sudo yum localinstall --nogpgcheck docker-engine-1.7.0-0.1.el6.x86_64.rpm
-
-5. Start the Docker daemon.
-
-		$ sudo service docker start
-
-6. Verify `docker` is installed correctly.
-
-		$ sudo docker run hello-world
-		Unable to find image 'hello-world:latest' locally
-		latest: Pulling from hello-world
-		a8219747be10: Pull complete 
-		91c95931e552: Already exists 
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
-		Status: Downloaded newer image for hello-world:latest
-		Hello from Docker.
-		This message shows that your installation appears to be working correctly.
-
-		To generate this message, Docker took the following steps:
-		 1. The Docker client contacted the Docker daemon.
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
-				(Assuming it was not already locally available.)
-		 3. The Docker daemon created a new container from that image which runs the
-				executable that produces the output you are currently reading.
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
-				to your terminal.
-
-		To try something more ambitious, you can run an Ubuntu container with:
-		 $ docker run -it ubuntu bash
-
-		For more examples and ideas, visit:
-		 http://docs.docker.com/userguide/
- 
-## Create a docker group		
-
-The `docker` daemon binds to a Unix socket instead of a TCP port. By default
-that Unix socket is owned by the user `root` and other users can access it with
-`sudo`. For this reason, `docker` daemon always runs as the `root` user.
-
-To avoid having to use `sudo` when you use the `docker` command, create a Unix
-group called `docker` and add users to it. When the `docker` daemon starts, it
-makes the ownership of the Unix socket read/writable by the `docker` group.
-
->**Warning**: The `docker` group is equivalent to the `root` user; For details
->on how this impacts security in your system, see [*Docker Daemon Attack
->Surface*](/articles/security/#docker-daemon-attack-surface) for details.
-
-To create the `docker` group and add your user:
-
-1. Log into your machine as a user with `sudo` or `root` privileges.
-
-2. Create the `docker` group and add your user.
-
-    `sudo usermod -aG docker your_username`
-
-3. Log out and log back in.
-
-    This ensures your user is running with the correct permissions.
-
-4. Verify your work by running `docker` without `sudo`.
-
-			$ docker run hello-world
- 
-## Start the docker daemon at boot
-
-To ensure Docker starts when you boot your system, do the following:
-
-    $ sudo chkconfig docker on
-
-If you need to add an HTTP Proxy, set a different directory or partition for the
-Docker runtime files, or make other customizations, read our Systemd article to
-learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
-
-
-## Uninstall
-
-You can uninstall the Docker software with `yum`.  
-
-1. List the package you have installed.
-
-		$ yum list installed | grep docker
-		yum list installed | grep docker
-		docker-engine.x86_64                1.7.0-0.1.el6
-																																					 @/docker-engine-1.7.0-0.1.el6.x86_64
-
-2. Remove the package.
-
-		$ sudo yum -y remove docker-engine.x86_64 
-
-	This command does not remove images, containers, volumes, or user created
-	configuration files on your host. 
-
-3. To delete all images, containers, and volumes run the following command:
-
-		$ rm -rf /var/lib/docker
-
-4. Locate and delete any user-created configuration files.

docs/mkdocs.yml

@@ -0,0 +1,229 @@
+site_name: Docker Documentation
+#site_url: https://docs.docker.com/
+site_url: /
+site_description: Documentation for fast and lightweight Docker container based virtualization framework.
+site_favicon: img/favicon.png
+
+dev_addr: '0.0.0.0:8000'
+
+repo_url: https://github.com/docker/docker/
+
+docs_dir: sources
+
+include_search: true
+
+use_absolute_urls: true
+
+# theme: docker
+theme_dir: ./theme/mkdocs/
+theme_center_lead: false
+
+copyright: Copyright © 2014-2015, Docker, Inc.
+google_analytics: ['UA-6096819-11', 'docker.io']
+
+pages:
+
+# Introduction:
+- ['index.md', 'About', 'Docker']
+- ['introduction/understanding-docker.md', 'About', 'Understanding Docker']
+- ['release-notes.md', 'About', 'Release notes']
+- ['reference/glossary.md', 'About', 'Glossary']
+- ['introduction/index.md', '**HIDDEN**']
+
+
+# Installation:
+- ['installation/index.md', '**HIDDEN**']
+- ['installation/ubuntulinux.md', 'Installation', 'Ubuntu']
+- ['installation/mac.md', 'Installation', 'Mac OS X']
+- ['kitematic/index.md', 'Installation', 'Kitematic on OS X']
+- ['installation/windows.md', 'Installation', 'Microsoft Windows']
+- ['installation/testing-windows-docker-client.md', 'Installation', 'Building and testing the Windows Docker client']
+- ['installation/amazon.md', 'Installation', 'Amazon EC2']
+- ['installation/archlinux.md', 'Installation', 'Arch Linux']
+- ['installation/binaries.md', 'Installation', 'Binaries']
+- ['installation/centos.md', 'Installation', 'CentOS']
+- ['installation/cruxlinux.md', 'Installation', 'CRUX Linux']
+- ['installation/debian.md', 'Installation', 'Debian']
+- ['installation/fedora.md', 'Installation', 'Fedora']
+- ['installation/frugalware.md', 'Installation', 'FrugalWare']
+- ['installation/google.md', 'Installation', 'Google Cloud Platform']
+- ['installation/gentoolinux.md', 'Installation', 'Gentoo']
+- ['installation/softlayer.md', 'Installation', 'IBM Softlayer']
+- ['installation/joyent.md', 'Installation', 'Joyent Compute Service']
+- ['installation/azure.md', 'Installation', 'Microsoft Azure']
+- ['installation/rackspace.md', 'Installation', 'Rackspace Cloud']
+- ['installation/rhel.md', 'Installation', 'Red Hat Enterprise Linux']
+- ['installation/oracle.md', 'Installation', 'Oracle Linux']
+- ['installation/SUSE.md', 'Installation', 'SUSE']
+- ['compose/install.md', 'Installation', 'Docker Compose']
+
+# User Guide:
+- ['userguide/index.md', 'User Guide', 'The Docker user guide' ]
+- ['userguide/dockerhub.md', 'User Guide', 'Getting started with Docker Hub' ]
+- ['userguide/dockerizing.md', 'User Guide', 'Dockerizing applications' ]
+- ['userguide/usingdocker.md', 'User Guide', 'Working with containers' ]
+- ['userguide/dockerimages.md', 'User Guide', 'Working with Docker images' ]
+- ['userguide/dockerlinks.md', 'User Guide', 'Linking containers together' ]
+- ['userguide/dockervolumes.md', 'User Guide', 'Managing data in containers' ]
+- ['userguide/labels-custom-metadata.md', 'User Guide', 'Apply custom metadata' ]
+- ['userguide/dockerrepos.md', 'User Guide', 'Working with Docker Hub' ]
+- ['userguide/level1.md', '**HIDDEN**' ]
+- ['userguide/level2.md', '**HIDDEN**' ]
+- ['compose/index.md', 'User Guide', 'Docker Compose' ]
+- ['compose/production.md', 'User Guide', '    ▪  Use Compose in production' ]
+- ['compose/extends.md', 'User Guide', '    ▪  Extend Compose services' ]
+- ['machine/index.md', 'User Guide', 'Docker Machine' ]
+- ['swarm/index.md', 'User Guide', 'Docker Swarm' ]
+- ['kitematic/userguide.md', 'User Guide', 'Kitematic']
+
+# Docker Hub docs:
+- ['docker-hub/index.md', 'Docker Hub', 'Docker Hub' ]
+- ['docker-hub/accounts.md', 'Docker Hub', 'Accounts']
+- ['docker-hub/userguide.md', 'Docker Hub', 'User Guide']
+- ['docker-hub/repos.md', 'Docker Hub', 'Your Repositories']
+- ['docker-hub/builds.md', 'Docker Hub', 'Automated Builds']
+- ['docker-hub/official_repos.md', 'Docker Hub', 'Official Repositories']
+
+# Docker Hub Enterprise:
+- ['docker-hub-enterprise/index.md', 'Docker Hub Enterprise', 'Overview' ]
+- ['docker-hub-enterprise/quick-start.md', 'Docker Hub Enterprise', 'Quick Start: Basic Workflow' ]
+- ['docker-hub-enterprise/userguide.md', 'Docker Hub Enterprise', 'User Guide' ]
+- ['docker-hub-enterprise/adminguide.md', 'Docker Hub Enterprise', 'Admin Guide' ]
+- ['docker-hub-enterprise/install.md', 'Docker Hub Enterprise', '  Installation' ]
+- ['docker-hub-enterprise/configuration.md', 'Docker Hub Enterprise', '  Configuration options' ]
+- ['docker-hub-enterprise/support.md', 'Docker Hub Enterprise', 'Support' ]
+- ['docker-hub-enterprise/release-notes.md', 'Docker Hub Enterprise', 'Release notes' ]
+
+# Examples:
+- ['examples/index.md', '**HIDDEN**']
+- ['examples/nodejs_web_app.md', 'Examples', 'Dockerizing a Node.js web application']
+- ['examples/mongodb.md', 'Examples', 'Dockerizing MongoDB']
+- ['examples/running_redis_service.md', 'Examples', 'Dockerizing a Redis service']
+- ['examples/postgresql_service.md', 'Examples', 'Dockerizing a PostgreSQL service']
+- ['examples/running_riak_service.md', 'Examples', 'Dockerizing a Riak service']
+- ['examples/running_ssh_service.md', 'Examples', 'Dockerizing an SSH service']
+- ['examples/couchdb_data_volumes.md', 'Examples', 'Dockerizing a CouchDB service']
+- ['examples/apt-cacher-ng.md', 'Examples', 'Dockerizing an Apt-Cacher-ng service']
+- ['compose/django.md', 'Examples', 'Getting started with Compose and Django']
+- ['compose/rails.md', 'Examples', 'Getting started with Compose and Rails']
+- ['compose/wordpress.md', 'Examples', 'Getting started with Compose and Wordpress']
+- ['kitematic/minecraft-server.md', 'Examples', 'Kitematic: Minecraft server']
+- ['kitematic/nginx-web-server.md', 'Examples', 'Kitematic: Ngnix web server']
+- ['kitematic/rethinkdb-dev-database.md', 'Examples', 'Kitematic: RethinkDB development database']
+
+# Articles
+- ['articles/index.md', '**HIDDEN**']
+- ['articles/basics.md', 'Articles', 'Docker basics']
+- ['articles/networking.md', 'Articles', 'Advanced networking']
+- ['articles/security.md', 'Articles', 'Security']
+- ['articles/https.md', 'Articles', 'Running Docker with HTTPS']
+- ['articles/registry_mirror.md', 'Articles', 'Run a local registry mirror']
+- ['articles/host_integration.md', 'Articles', 'Automatically starting containers']
+- ['articles/baseimages.md', 'Articles', 'Creating a base image']
+- ['articles/dockerfile_best-practices.md', 'Articles', 'Best practices for writing Dockerfiles']
+- ['articles/certificates.md', 'Articles', 'Using certificates for repository client verification']
+- ['articles/using_supervisord.md', 'Articles', 'Using Supervisor']
+- ['articles/configuring.md', 'Articles', 'Configuring Docker']
+- ['articles/cfengine_process_management.md', 'Articles', 'Process management with CFEngine']
+- ['articles/puppet.md', 'Articles', 'Using Puppet']
+- ['articles/chef.md', 'Articles', 'Using Chef']
+- ['articles/dsc.md', 'Articles', 'Using PowerShell DSC']
+- ['articles/ambassador_pattern_linking.md', 'Articles', 'Cross-Host linking using ambassador containers']
+- ['articles/runmetrics.md', 'Articles', 'Runtime metrics']
+- ['articles/b2d_volume_resize.md', 'Articles', 'Increasing a Boot2Docker volume']
+- ['articles/systemd.md', 'Articles', 'Controlling and configuring Docker using Systemd']
+
+# Reference
+- ['reference/index.md', '**HIDDEN**']
+- ['reference/commandline/index.md', '**HIDDEN**']
+- ['reference/commandline/cli.md', 'Reference', 'Docker command line']
+- ['reference/builder.md', 'Reference', 'Dockerfile']
+- ['faq.md', 'Reference', 'FAQ']
+- ['reference/run.md', 'Reference', 'Run reference']
+- ['reference/logging/journald.md', '**HIDDEN**']
+- ['compose/cli.md', 'Reference', 'Compose command line']
+- ['compose/yml.md', 'Reference', 'Compose yml']
+- ['compose/env.md', 'Reference', 'Compose ENV variables']
+- ['compose/completion.md', 'Reference', 'Compose commandline completion']
+- ['swarm/discovery.md', 'Reference', 'Swarm discovery']
+- ['swarm/scheduler/strategy.md', 'Reference', 'Swarm strategies']
+- ['swarm/scheduler/filter.md', 'Reference', 'Swarm filters']
+- ['swarm/API.md', 'Reference', 'Swarm API']
+- ['reference/api/index.md', '**HIDDEN**']
+- ['registry/index.md', 'Reference', 'Docker Registry 2.0']
+- ['registry/deploying.md', 'Reference', '    ▪  Deploy a registry' ]
+- ['registry/configuration.md', 'Reference', '    ▪  Configure a registry' ]
+- ['registry/storagedrivers.md', 'Reference', '    ▪  Storage driver model' ]
+- ['registry/notifications.md', 'Reference', '    ▪  Work with notifications' ]
+- ['registry/spec/api.md', 'Reference', '    ▪  Registry Service API v2' ]
+- ['registry/spec/json.md', 'Reference', '    ▪  JSON format' ]
+- ['registry/spec/auth/token.md', 'Reference', '    ▪  Authenticate via central service' ]
+- ['reference/api/hub_registry_spec.md', 'Reference', 'Docker Hub and Registry 1.0']
+- ['reference/api/registry_api.md', 'Reference', '    ▪ Docker Registry API v1']
+- ['reference/api/registry_api_client_libraries.md', 'Reference', '    ▪ Docker Registry 1.0 API client libraries']
+#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']
+- ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API']
+#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']
+- ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API']
+- ['reference/api/docker_remote_api_v1.19.md', 'Reference', 'Docker Remote API v1.19']
+- ['reference/api/docker_remote_api_v1.18.md', 'Reference', 'Docker Remote API v1.18']
+- ['reference/api/docker_remote_api_v1.17.md', 'Reference', 'Docker Remote API v1.17']
+- ['reference/api/docker_remote_api_v1.16.md', 'Reference', 'Docker Remote API v1.16']
+- ['reference/api/docker_remote_api_v1.15.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.14.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.13.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.12.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.11.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.10.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.9.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.8.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.7.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.6.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.5.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.4.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.3.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.2.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.1.md', '**HIDDEN**']
+- ['reference/api/docker_remote_api_v1.0.md', '**HIDDEN**']
+- ['reference/api/remote_api_client_libraries.md', 'Reference', 'Docker Remote API client libraries']
+- ['reference/api/docker_io_accounts_api.md', 'Reference', 'Docker Hub accounts API']
+- ['kitematic/faq.md', 'Reference', 'Kitematic: FAQ']
+- ['kitematic/known-issues.md', 'Reference', 'Kitematic: Known issues']
+
+# Hidden registry files
+- ['registry/storage-drivers/azure.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ]
+- ['registry/storage-drivers/s3.md', '**HIDDEN**' ]
+
+- ['jsearch.md', '**HIDDEN**']
+
+# - ['static_files/README.md', 'static_files', 'README']
+- ['terms/index.md', '**HIDDEN**']
+- ['terms/layer.md', '**HIDDEN**']
+- ['terms/index.md', '**HIDDEN**']
+- ['terms/registry.md', '**HIDDEN**']
+- ['terms/container.md', '**HIDDEN**']
+- ['terms/repository.md', '**HIDDEN**']
+- ['terms/filesystem.md', '**HIDDEN**']
+- ['terms/image.md', '**HIDDEN**']
+
+
+# Project:
+- ['project/index.md', '**HIDDEN**']
+- ['project/who-written-for.md', 'Contributor', 'README first']
+- ['project/software-required.md', 'Contributor', 'Get required software for Linux or OS X'] 
+- ['project/software-req-win.md', 'Contributor', 'Get required software for Windows']
+- ['project/set-up-git.md', 'Contributor', 'Configure Git for contributing'] 
+- ['project/set-up-dev-env.md', 'Contributor', 'Work with a development container'] 
+- ['project/test-and-docs.md', 'Contributor', 'Run tests and test documentation']
+- ['project/make-a-contribution.md', 'Contributor', 'Understand contribution workflow']
+- ['project/find-an-issue.md', 'Contributor', 'Find an issue'] 
+- ['project/work-issue.md', 'Contributor', 'Work on an issue'] 
+- ['project/create-pr.md', 'Contributor', 'Create a pull request'] 
+- ['project/review-pr.md', 'Contributor', 'Participate in the PR review'] 
+- ['project/advanced-contributing.md', 'Contributor', 'Advanced contributing']
+- ['project/get-help.md', 'Contributor', 'Where to get help']
+- ['project/coding-style.md', 'Contributor', 'Coding style guide']
+- ['project/doc-style.md', 'Contributor', 'Documentation style guide']
+

docs/release.sh

@@ -0,0 +1,176 @@
+#!/bin/bash
+set -e
+
+set -o pipefail
+
+usage() {
+	cat >&2 <<'EOF'
+To publish the Docker documentation you need to set your access_key and secret_key in the docs/awsconfig file
+(with the keys in a [profile $AWS_S3_BUCKET] section - so you can have more than one set of keys in your file)
+and set the AWS_S3_BUCKET env var to the name of your bucket.
+
+If you're publishing the current release's documentation, also set `BUILD_ROOT=yes`
+
+make AWS_S3_BUCKET=docs-stage.docker.com docs-release
+
+will then push the documentation site to your s3 bucket.
+
+ Note: you can add `OPTIONS=--dryrun` to see what will be done without sending to the server
+ You can also add NOCACHE=1 to publish without a cache, which is what we do for the master docs.
+EOF
+	exit 1
+}
+
+create_robots_txt() {
+	if [ "$AWS_S3_BUCKET" == "docs.docker.com" ]; then
+		cat > ./sources/robots.txt <<-'EOF'
+		User-agent: *
+		Allow: /
+		EOF
+	else
+		cat > ./sources/robots.txt <<-'EOF'
+		User-agent: *
+		Disallow: /
+		EOF
+	fi
+}
+
+setup_s3() {
+	# Try creating the bucket. Ignore errors (it might already exist).
+	echo "create $BUCKET if it does not exist"
+	aws s3 mb --profile $BUCKET s3://$BUCKET 2>/dev/null || true
+
+	# Check access to the bucket.
+	echo "test $BUCKET exists"
+	aws s3 --profile $BUCKET ls s3://$BUCKET
+
+	# Make the bucket accessible through website endpoints.
+	echo "make $BUCKET accessible as a website"
+	#aws s3 website s3://$BUCKET --index-document index.html --error-document jsearch/index.html
+	local s3conf=$(cat s3_website.json | envsubst)
+	aws s3api --profile $BUCKET put-bucket-website --bucket $BUCKET --website-configuration "$s3conf"
+}
+
+build_current_documentation() {
+	mkdocs build
+	cd site/
+	gzip -9k -f search_content.json
+	cd ..
+}
+
+upload_current_documentation() {
+	src=site/
+	dst=s3://$BUCKET$1
+
+	cache=max-age=3600
+	if [ "$NOCACHE" ]; then
+		cache=no-cache
+	fi
+
+	printf "\nUploading $src to $dst\n"
+
+	# a really complicated way to send only the files we want
+	# if there are too many in any one set, aws s3 sync seems to fall over with 2 files to go
+	#  versions.html_fragment
+	include="--recursive --include \"*.$i\" "
+	run="aws s3 cp $src $dst $OPTIONS --profile $BUCKET --cache-control $cache --acl public-read $include"
+	printf "\n=====\n$run\n=====\n"
+	$run
+
+	# Make sure the search_content.json.gz file has the right content-encoding
+	aws s3 cp --profile $BUCKET --cache-control $cache --content-encoding="gzip" --acl public-read "site/search_content.json.gz" "$dst"
+}
+
+invalidate_cache() {
+	if [[ -z "$DISTRIBUTION_ID" ]]; then
+		echo "Skipping Cloudfront cache invalidation"
+		return
+	fi
+
+	dst=$1
+
+	aws configure set preview.cloudfront true
+
+	# Get all the files
+	# not .md~ files
+	# replace spaces w %20 so urlencoded
+	files=( $(find site/ -not -name "*.md*" -type f | sed 's/site//g' | sed 's/ /%20/g') )
+
+	len=${#files[@]}
+	last_file=${files[$((len-1))]}
+
+	echo "aws cloudfront  create-invalidation --profile $AWS_S3_BUCKET --distribution-id $DISTRIBUTION_ID --invalidation-batch '" > batchfile
+	echo "{\"Paths\":{\"Quantity\":$len," >> batchfile
+	echo "\"Items\": [" >> batchfile
+
+	for file in "${files[@]}" ; do
+		if [[ $file == $last_file ]]; then
+			comma=""
+		else
+			comma=","
+		fi
+		echo "\"$dst$file\"$comma" >> batchfile
+	done
+
+	echo "]}, \"CallerReference\":\"$(date)\"}'" >> batchfile
+
+	sh batchfile
+}
+
+main() {
+	[ "$AWS_S3_BUCKET" ] || usage
+
+	# Make sure there is an awsconfig file
+	export AWS_CONFIG_FILE=$(pwd)/awsconfig
+	[ -f "$AWS_CONFIG_FILE" ] || usage
+
+	# Get the version
+	VERSION=$(cat VERSION)
+
+	# Disallow pushing dev docs to master
+	if [ "$AWS_S3_BUCKET" == "docs.docker.com" ] && [ "${VERSION%-dev}" != "$VERSION" ]; then
+		echo "Please do not push '-dev' documentation to docs.docker.com ($VERSION)"
+		exit 1
+	fi
+
+	# Clean version - 1.0.2-dev -> 1.0
+	export MAJOR_MINOR="v${VERSION%.*}"
+
+	export BUCKET=$AWS_S3_BUCKET
+	export AWS_DEFAULT_PROFILE=$BUCKET
+
+	# debug variables
+	echo "bucket: $BUCKET, full version: $VERSION, major-minor: $MAJOR_MINOR"
+	echo "cfg file: $AWS_CONFIG_FILE ; profile: $AWS_DEFAULT_PROFILE"
+
+	# create the robots.txt
+	create_robots_txt
+
+	if [ "$OPTIONS" != "--dryrun" ]; then
+		setup_s3
+	fi
+
+	# Default to only building the version specific docs
+	# so we don't clober the latest by accident with old versions
+	if [ "$BUILD_ROOT" == "yes" ]; then
+		echo "Building root documentation"
+		build_current_documentation
+
+		echo "Uploading root documentation"
+		upload_current_documentation
+		[ "$NOCACHE" ] || invalidate_cache
+	fi
+
+	#build again with /v1.0/ prefix
+	sed -i "s/^site_url:.*/site_url: \/$MAJOR_MINOR\//" mkdocs.yml
+	echo "Building the /$MAJOR_MINOR/ documentation"
+	build_current_documentation
+
+	echo "Uploading the documentation"
+	upload_current_documentation "/$MAJOR_MINOR/"
+
+	# Invalidating cache
+	[ "$NOCACHE" ] || invalidate_cache "/$MAJOR_MINOR"
+}
+
+main

docs/s3_website.json

@@ -0,0 +1,50 @@
+{
+  "ErrorDocument": {
+    "Key": "jsearch/index.html"
+  },
+  "IndexDocument": {
+    "Suffix": "index.html"
+  },
+  "RoutingRules": [
+    { "Condition": { "KeyPrefixEquals": "en/latest/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
+    { "Condition": { "KeyPrefixEquals": "en/master/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
+    { "Condition": { "KeyPrefixEquals": "en/v0.6.3/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } },
+    { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } },
+    { "Condition": { "KeyPrefixEquals": "index/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-io/" } },
+    { "Condition": { "KeyPrefixEquals": "reference/api/index_api/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "reference/api/docker-io_api/" } },
+    { "Condition": { "KeyPrefixEquals": "docker-hub/groups.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/groups.png" } },
+    { "Condition": { "KeyPrefixEquals": "docker-hub/hub.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/hub.png" } },
+    { "Condition": { "KeyPrefixEquals": "docker-hub/invite.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/invite.png" } },
+    { "Condition": { "KeyPrefixEquals": "docker-hub/orgs.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/orgs.png" } },
+    { "Condition": { "KeyPrefixEquals": "docker-hub/repos.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/hub-images/repos.png" } },
+    { "Condition": { "KeyPrefixEquals": "installation/images/linux_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/linux_docker_host.svg" } },
+    { "Condition": { "KeyPrefixEquals": "installation/images/osx_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/osx_docker_host.svg" } },
+    { "Condition": { "KeyPrefixEquals": "installation/images/win_docker_host.png" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/images/win_docker_host.svg" } },
+    { "Condition": { "KeyPrefixEquals": "examples/hello_world/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerizing/" } },
+    { "Condition": { "KeyPrefixEquals": "examples/python_web_app/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerizing/" } },
+    { "Condition": { "KeyPrefixEquals": "use/working_with_volumes/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockervolumes/" } },
+    { "Condition": { "KeyPrefixEquals": "use/working_with_links_names/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerlinks/" } },
+    { "Condition": { "KeyPrefixEquals": "use/workingwithrepository/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerrepos/" } },
+    { "Condition": { "KeyPrefixEquals": "use/port_redirection" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerlinks/" } },
+    { "Condition": { "KeyPrefixEquals": "use/networking/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/networking/" } },
+    { "Condition": { "KeyPrefixEquals": "use/puppet/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/puppet/" } },
+    { "Condition": { "KeyPrefixEquals": "use/ambassador_pattern_linking/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/ambassador_pattern_linking/" } },
+    { "Condition": { "KeyPrefixEquals": "use/basics/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/basics/" } },
+    { "Condition": { "KeyPrefixEquals": "use/chef/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/chef/" } },
+    { "Condition": { "KeyPrefixEquals": "use/host_integration/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/host_integration/" } },
+    { "Condition": { "KeyPrefixEquals": "docker-io/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/" } },
+    { "Condition": { "KeyPrefixEquals": "examples/cfengine_process_management/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/cfengine_process_management/" } },
+    { "Condition": { "KeyPrefixEquals": "examples/https/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/https/" } },
+    { "Condition": { "KeyPrefixEquals": "examples/ambassador_pattern_linking/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/ambassador_pattern_linking/" } },
+    { "Condition": { "KeyPrefixEquals": "examples/using_supervisord/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "articles/using_supervisord/" } },
+    { "Condition": { "KeyPrefixEquals": "reference/api/registry_index_spec/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "reference/api/hub_registry_spec/" } },
+    { "Condition": { "KeyPrefixEquals": "use/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "examples/" } },
+    { "Condition": { "KeyPrefixEquals": "installation/openSUSE/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/SUSE/" } },
+    { "Condition": { "KeyPrefixEquals": "contributing/contributing/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/who-written-for/" } },
+    { "Condition": { "KeyPrefixEquals": "contributing/devenvironment/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/set-up-prereqs/" } },
+    { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } },
+    { "Condition": { "KeyPrefixEquals": "registry/overview/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "registry/" } }
+
+  ]
+}
+

docs/sources/articles/ambassador_pattern_linking.md

@@ -1,13 +1,6 @@
-<!--[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]-->
+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
 
 # Link via an ambassador container
 

docs/sources/articles/b2d_volume_resize.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: Resizing a Boot2Docker volume	
+page_description: Resizing a Boot2Docker volume in VirtualBox with GParted
+page_keywords: boot2docker, volume, virtualbox
 
 # Getting “no space left on device” errors with Boot2Docker?
 

docs/sources/articles/baseimages.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: Create a base image
+page_description: How to create base images
+page_keywords: Examples, Usage, base image, docker, documentation, examples
 
 # Create a base image
 

docs/sources/articles/basics.md

@@ -1,14 +1,8 @@
-<!--[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]-->
+page_title: First steps with Docker
+page_description: Common usage and commands
+page_keywords: Examples, Usage, basic commands, docker, documentation, examples
 
-# "Get started with containers
+# First steps with Docker
 
 This guide assumes you have a working installation of Docker. To check
 your Docker install, run the following command:
@@ -47,9 +41,7 @@ image cache.
 > characters of the full image ID - which can be found using
 > `docker inspect` or `docker images --no-trunc=true`
 
-> **Note:** if you are using a remote Docker daemon, such as Boot2Docker, 
-> then _do not_ type the `sudo` before the `docker` commands shown in the
-> documentation's examples.
+{{ include "no-remote-sudo.md" }}
 
 ## Running an interactive shell
 

docs/sources/articles/certificates.md

@@ -1,13 +1,6 @@
-<!--[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 = "mn_docker_hub"
-weight = 7
-+++
-<![end-metadata]-->
+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
 
 # Using certificates for repository client verification
 

docs/sources/articles/cfengine_process_management.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: Process management with CFEngine
+page_description: Managing containerized processes with CFEngine
+page_keywords: cfengine, process, management, usage, docker, documentation
 
 # Process management with CFEngine
 

docs/sources/articles/chef.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: Using Chef
+page_description: Installation and using Docker via Chef
+page_keywords: chef, installation, usage, docker, documentation
 
 # Using Chef
 

docs/sources/articles/configuring.md

@@ -1,13 +1,6 @@
-<!--[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]-->
+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
 
 # Configuring and running Docker on various distributions
 

docs/sources/articles/dockerfile_best-practices.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+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
 
 # Best practices for writing Dockerfiles
 

docs/sources/articles/dsc.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: PowerShell DSC Usage
+page_description: Using DSC to configure a new Docker host
+page_keywords: powershell, dsc, installation, usage, docker, documentation
 
 # Using PowerShell DSC
 

docs/sources/articles/host_integration.md

@@ -1,13 +1,6 @@
-<!--[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]-->
+page_title: Automatically start containers
+page_description: How to generate scripts for upstart, systemd, etc.
+page_keywords: systemd, upstart, supervisor, docker, documentation, host integration
 
 # Automatically start containers
 

docs/sources/articles/https.md

@@ -1,15 +1,8 @@
-<!--[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]-->
+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
 
-# Protect the Docker daemon socket
+# Protecting the Docker daemon socket with HTTPS
 
 By default, Docker runs via a non-networked Unix socket. It can also
 optionally communicate using a HTTP socket.

docs/sources/articles/https/README.md

@@ -9,7 +9,7 @@ so my process is
 
 $ boot2docker ssh
 $$ git clone https://github.com/docker/docker
-$$ cd docker/docs/articles/https
+$$ cd docker/docs/sources/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/articles/https
+$$ cd docker/docs/sources/articles/https
 $$ make client
 
 the last will connect first with `--tls` and then with `--tlsverify`

docs/sources/articles/networking.md

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

docs/sources/articles/puppet.md

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

docs/sources/articles/registry_mirror.md

@@ -1,13 +1,6 @@
-<!--[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 = "mn_docker_hub"
-weight = 8
-+++
-<![end-metadata]-->
+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
 
 # Run a local registry mirror
 

docs/sources/articles/runmetrics.md

@@ -1,13 +1,6 @@
-<!--[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]-->
+page_title: Runtime metrics
+page_description: Measure the behavior of running containers
+page_keywords: docker, metrics, CPU, memory, disk, IO, run, runtime
 
 # Runtime metrics
 

docs/sources/articles/security.md

@@ -1,13 +1,6 @@
-<!--[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]-->
+page_title: Docker security
+page_description: Review of the Docker Daemon attack surface
+page_keywords: Docker, Docker documentation, security
 
 # Docker security
 

docs/sources/articles/systemd.md

@@ -1,15 +1,8 @@
-<!--[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]-->
+page_title: Controlling and configuring Docker using systemd
+page_description: Controlling and configuring Docker using systemd
+page_keywords: docker, daemon, systemd, configuration
 
-# Control and configure Docker with systemd
+# Controlling and configuring Docker using 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/sources/articles/using_supervisord.md

@@ -1,12 +1,6 @@
-<!--[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]-->
+page_title: Using Supervisor with Docker
+page_description: How to use Supervisor process management with Docker
+page_keywords: docker, supervisor, process management
 
 # Using Supervisor with Docker
 

docs/sources/docker-hub-enterprise/adminguide.md

@@ -0,0 +1,104 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Admin guide
+page_description: Documentation describing administration of Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, hub, enterprise
+
+# Docker Hub Enterprise Administrator's Guide
+
+This guide covers tasks and functions an administrator of Docker Hub Enterprise
+(DHE) will need to know about, such as reporting, logging, system management,
+performance metrics, etc.
+For tasks DHE users need to accomplish, such as using DHE to push and pull
+images, please visit the [User's Guide](./userguide).
+
+## Reporting
+
+### System Health
+
+![System Health page</admin/metrics/>](../assets/admin-metrics.png)
+
+The "System Health" tab displays resource utilization metrics for the DHE host
+as well as for each of its contained services. The CPU and RAM usage meters at
+the top indicate overall resource usage for the host, while detailed time-series
+charts are provided below for each service. You can mouse-over the charts or
+meters to see detailed data points.
+
+Clicking on a service name (i.e., "load_balancer", "admin_server", etc.) will
+display the network, CPU, and memory (RAM) utilization data for the specified
+service. See below for a
+[detailed explanation of the available services](#services).
+
+### Logs
+
+![System Logs page</admin/logs/>](../assets/admin-logs.png)
+
+Click the "Logs" tab to view all logs related to your DHE instance. You will see
+log sections on this page for each service in your DHE instance. Older or newer
+logs can be loaded by scrolling up or down. See below for a
+[detailed explanation of the available services](#services).
+
+DHE's log files can be found on the host in `/usr/local/etc/dhe/logs/`. The
+files are limited to a maximum size of 64mb. They are rotated every two weeks,
+when the aggregator sends logs to the collection server, or they are rotated if
+a logfile would exceed 64mb without rotation. Log files are named `<component
+name>-<timestamp at rotation>`, where the "component name" is the service it
+provides (`manager`, `admin-server`, etc.).
+
+### Usage statistics and crash reports
+
+During normal use, DHE generates usage statistics and crash reports. This
+information is collected by Docker, Inc. to help us prioritize features, fix
+bugs, and improve our products. Specifically, Docker, Inc. collects the
+following information:
+
+* Error logs
+* Crash logs
+
+## Emergency access to DHE
+
+If your authenticated or public access to the DHE web interface has stopped
+working, but your DHE admin container is still running, you can add an
+[ambassador container](https://docs.docker.com/articles/ambassador_pattern_linking/)
+to get temporary unsecure access to it by running:
+
+    $ docker run --rm -it --link docker_hub_enterprise_admin_server:admin -p 9999:80 svendowideit/ambassador
+
+> **Note:** This guide assumes you can run Docker commands from a machine where
+> you are a member of the `docker` group, or have root privileges. Otherwise,
+> you may need to add `sudo` to the example command above.
+
+This will give you access on port `9999` on your DHE server - `http://<dhe-host-ip>:9999/admin/`.
+
+## Services
+
+DHE runs several Docker services which are essential to its reliability and
+usability. The following services are included; you can see their details by
+running queries on the [System Health](#system-health) and [Logs](#logs) pages:
+
+* `admin_server`: Used for displaying system health, performing upgrades,
+configuring settings, and viewing logs.
+* `load_balancer`: Used for maintaining high availability by distributing load
+to each image storage service (`image_storage_X`).
+* `log_aggregator`: A microservice used for aggregating logs from each of the
+other services. Handles log persistence and rotation on disk.
+* `image_storage_X`: Stores Docker images using the [Docker Registry HTTP API V2](https://github.com/docker/distribution/blob/master/doc/SPEC.md). Typically,
+multiple image storage services are used in order to provide greater uptime and
+faster, more efficient resource utilization.
+
+## DHE system management
+
+The `dockerhubenterprise/manager` image is used to control the DHE system. This
+image uses the Docker socket to orchestrate the multiple services that comprise
+DHE.
+
+     $ sudo bash -c "$(sudo docker run dockerhubenterprise/manager [COMMAND])"
+
+Supported commands are: `install`, `start`, `stop`, `restart`, `status`, and
+`upgrade`.
+
+> **Note**: `sudo` is needed for `dockerhubenterprise/manager` commands to
+> ensure that the Bash script is run with full access to the Docker host.
+
+## Next Steps
+
+For information on installing DHE, take a look at the [Installation instructions](./install.md).

docs/sources/docker-hub-enterprise/configuration.md

@@ -0,0 +1,357 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Configuration options
+page_description: Configuration instructions for Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry
+
+# Configuring DHE
+
+## Overview
+
+This page will help you properly configure Docker Hub Enterprise (DHE) so it can
+run in your environment. 
+
+Start with DHE loaded in your browser and click  the "Settings" tab to view
+configuration options. You'll see options for configuring:
+
+* Domains and ports
+* Security settings
+* Storage settings
+* Authentication settings
+* Your DHE license
+
+## Domains and Ports
+
+![Domain and Ports page</admin/settings#http>](../assets/admin-settings-http.png)
+
+* *Domain Name*: **required** defaults to an empty string, the fully qualified domain name assigned to the DHE host.
+* *Load Balancer HTTP Port*: defaults to 80, used as the entry point for the image storage service. To see load balancer status, you can query
+http://&lt;dhe-host&gt;/load_balancer_status.
+* *Load Balancer HTTPS Port*: defaults to 443, used as the secure entry point
+for the image storage service.
+* *HTTP_PROXY*: defaults to an empty string, proxy server for HTTP requests.
+* *HTTPS_PROXY*: defaults to an empty string, proxy server for HTTPS requests.
+* *NO_PROXY*: defaults to an empty string, proxy bypass for HTTP and HTTPS requests.
+
+
+> **Note**: If you need DHE to re-generate a self-signed certificate at some
+> point, you'll need to first delete `/usr/local/etc/dhe/ssl/server.pem`, and
+> then restart the DHE containers, either by changing and saving the "Domain Name",
+> or using `bash -c "$(docker run dockerhubenterprise/manager restart)"`.
+
+
+## Security
+
+![Security settings page</admin/settings#security>](../assets/admin-settings-security.png)
+
+* *SSL Certificate*: Used to enter the hash (string) from the SSL Certificate.
+This cert must be accompanied by its private key, entered below.
+* *Private Key*: The hash from the private key associated with the provided
+SSL Certificate (as a standard x509 key pair).
+
+In order to run, DHE requires encrypted communications via HTTPS/SSL between (a) the DHE registry and your Docker Engine(s), and (b) between your web browser and the DHE admin server. There are a few options for setting this up:
+
+1. You can use the self-signed certificate DHE generates by default.
+2. You can generate your own certificates using a public service or your enterprise's infrastructure. See the [Generating SSL certificates](#generating-ssl-certificates) section for the options available.
+
+If you are generating your own certificates, you can install them by following the instructions for
+[Adding your own registry certificates to DHE](#adding-your-own-registry-certificates-to-dhe).
+
+On the other hand, if you choose to use the DHE-generated certificates, or the
+certificates you generate yourself are not trusted by your client Docker hosts,
+you will need to do one of the following:
+
+* [Install a registry certificate on all of your client Docker daemons](#installing-registry-certificates-on-client-docker-daemons),
+
+* Set your [client Docker daemons to run with an unconfirmed connection to the registry](#if-you-cant-install-the-certificates).
+
+### Generating SSL certificates
+
+There are three basic approaches to generating certificates:
+
+1.  Most enterprises will have private key infrastructure (PKI) in place to
+generate keys. Consult with your security team or whomever manages your private
+key infrastructure. If you have this resource available, Docker recommends you
+use it.
+
+2. If your enterprise can't provide keys, you can use a public Certificate
+Authority (CA) like "InstantSSL.com" or "RapidSSL.com" to generate a
+certificate. If your certificates are generated using a globally trusted
+Certificate Authority, you won't need to install them on all of your
+client Docker daemons.
+
+3. Use the self-signed registry certificate generated by DHE, and install it
+onto the client Docker daemon hosts as shown below.
+
+### Adding your own Registry certificates to DHE
+
+Whichever method you use to generate certificates, once you have them
+you can set up your DHE server to use them by navigating to the "Settings" page,
+going to "Security," and putting the SSL Certificate text (including all
+intermediate Certificates, starting with the host) into the
+"SSL Certificate" edit box, and the previously generated Private key into
+the "SSL Private Key" edit box.
+
+Click the "Save" button, and then wait for the DHE Admin site to restart and
+reload. It should now be using the new certificate.
+
+Once the "Security" page has reloaded, it will show `#` hashes instead of the
+certificate text you pasted in.
+
+If your certificate is signed by a chain of Certificate Authorities that are
+already trusted by your Docker daemon servers, you can skip the "Installing
+registry certificates" step below.
+
+### Installing Registry certificates on client Docker daemons
+
+If your certificates do not have a trusted Certificate Authority, you will need
+to install them on each client Docker daemon host.
+
+The procedure for installing the DHE certificates on each Linux distribution has
+slightly different steps, as shown below.
+
+You can test this certificate using `curl`:
+
+```
+$ curl https://dhe.yourdomain.com/v2/
+curl: (60) SSL certificate problem: self signed certificate
+More details here: http://curl.haxx.se/docs/sslcerts.html
+
+curl performs SSL certificate verification by default, using a "bundle"
+ of Certificate Authority (CA) public keys (CA certs). If the default
+ bundle file isn't adequate, you can specify an alternate file
+ using the --cacert option.
+If this HTTPS server uses a certificate signed by a CA represented in
+ the bundle, the certificate verification probably failed due to a
+ problem with the certificate (it might be expired, or the name might
+ not match the domain name in the URL).
+If you'd like to turn off curl's verification of the certificate, use
+ the -k (or --insecure) option.
+
+$ curl --cacert /usr/local/etc/dhe/ssl/server.pem https://dhe.yourdomain.com/v2/
+{"errors":[{"code":"UNAUTHORIZED","message":"access to the requested resource is not authorized","detail":null}]}
+```
+
+Continue by following the steps corresponding to your chosen OS.
+
+#### Ubuntu/Debian
+
+```
+    $ export DOMAIN_NAME=dhe.yourdomain.com
+    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /usr/local/share/ca-certificates/$DOMAIN_NAME.crt
+    $ sudo update-ca-certificates
+    Updating certificates in /etc/ssl/certs... 1 added, 0 removed; done.
+    Running hooks in /etc/ca-certificates/update.d....done.
+    $ sudo service docker restart
+    docker stop/waiting
+    docker start/running, process 29291
+```
+
+#### RHEL
+
+```
+    $ export DOMAIN_NAME=dhe.yourdomain.com
+    $ openssl s_client -connect $DOMAIN_NAME:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee /etc/pki/ca-trust/source/anchors/$DOMAIN_NAME.crt
+    $ sudo update-ca-trust
+    $ sudo /bin/systemctl restart docker.service
+```
+
+#### Boot2Docker 1.6.0
+
+Install the CA cert (or the auto-generated cert) by adding the following to
+your `/var/lib/boot2docker/bootsync.sh`:
+
+```
+#!/bin/sh
+
+cat /var/lib/boot2docker/server.pem >> /etc/ssl/certs/ca-certificates.crt
+```
+
+
+Then get the certificate from the new DHE server using:
+
+```
+$ openssl s_client -connect dhe.yourdomain.com:443 -showcerts </dev/null 2>/dev/null | openssl x509 -outform PEM | sudo tee -a /var/lib/boot2docker/server.pem
+```
+
+If your certificate chain is complicated, you may want to use the changes in
+[Pull request 807](https://github.com/boot2docker/boot2docker/pull/807/files)
+
+Now you can either reboot your Boot2Docker virtual machine, or run the following to
+install the server certificate, and then restart the Docker daemon.
+
+```
+$ sudo chmod 755 /var/lib/boot2docker/bootsync.sh
+$ sudo /var/lib/boot2docker/bootsync.sh
+$ sudo /etc/init.d/docker restart`.
+```
+
+### If you can't install the certificates
+
+If for some reason you can't install the certificate chain on a client Docker host,
+or your certificates do not have a global CA, you can configure your Docker daemon to run in "insecure" mode. This is done by adding an extra flag,
+`--insecure-registry host-ip|domain-name`, to your client Docker daemon startup flags.
+You'll need to restart the Docker daemon for the change to take effect.
+
+This flag means that the communications between your Docker client and the DHE
+Registry server are still encrypted, but the client Docker daemon is not
+confirming that the Registry connection is not being hijacked or diverted.
+
+> **Note**: If you enter a "Domain Name" into the "Security" settings, it needs
+> to be DNS resolvable on any client Docker daemons that are running in
+> "insecure-registry" mode.
+
+To set the flag, follow the directions below for your operating system.
+
+#### Ubuntu
+
+On Ubuntu 14.04 LTS, you customize the Docker daemon configuration with the
+`/etc/defaults/docker` file.
+
+Open or create the `/etc/defaults/docker` file, and add the
+`--insecure-registry` flag to the `DOCKER_OPTS` setting (which may need to be
+added or uncommented) as follows:
+
+```
+DOCKER_OPTS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo service docker restart`.
+
+#### RHEL
+
+On RHEL, you customize the Docker daemon configuration with the
+`/etc/sysconfig/docker` file.
+
+Open or create the `/etc/sysconfig/docker` file, and add the
+`--insecure-registry` flag to the `OPTIONS` setting (which may need to be
+added or uncommented) as follows:
+
+```
+OPTIONS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo service docker restart`.
+
+### Boot2Docker
+
+On Boot2Docker, you customize the Docker daemon configuration with the
+`/var/lib/boot2docker/profile` file.
+
+Open or create the `/var/lib/boot2docker/profile` file, and add an `EXTRA_ARGS`
+setting as follows:
+
+```
+EXTRA_ARGS="--insecure-registry dhe.yourdomain.com"
+```
+
+Then restart the Docker daemon with `sudo /etc/init.d/docker restart`.
+
+## Image Storage Configuration
+
+DHE offers multiple methods for image storage, which are defined using specific
+storage drivers. Image storage can be local, remote, or on a cloud service such
+as S3. Storage drivers can be added or customized via the DHE storage driver
+API.
+
+![Storage settings page</admin/settings#storage>](../assets/admin-settings-storage.png)
+
+* *Yaml configuration file*: This file (`/usr/local/etc/dhe/storage.yml`) is
+used to configure the image storage services. The editable text of the file is
+displayed in the dialog box. The schema of this file is identical to that used
+by the [Registry 2.0](https://docs.docker.com/registry/configuration/).
+* If you are using the file system driver to provide local image storage, you will need to specify a root directory which will get mounted as a sub-path of
+`/var/local/dhe/image-storage`. The default value of this root directory is
+`/local`, so the full path to it is `/var/local/dhe/image-storage/local`.
+
+> **Note:**
+> Saving changes you've made to settings will restart the Docker Hub Enterprise
+> instance. The restart may cause a brief interruption for users of the image
+> storage system.
+
+## Authentication
+
+The "Authentication" settings tab lets DHE administrators control access
+to the DHE web admin tool and to the DHE Registry.
+
+The current authentication methods are `None`, `Basic` and `LDAP`.
+
+> **Note**: if you have issues logging into the DHE admin web interface after changing the authentication
+> settings, you may need to use the [emergency access to the DHE admin web interface](./adminguide.md#Emergency-access-to-the-dhe-admin-web-interface).
+
+### No authentication
+
+No authentication means that everyone that can access your DHE web administration
+site. This is not recommended for any use other than testing.
+
+
+### Basic authentication
+
+The `Basic` authentication setting allows the admin to provide username/password pairs local to DHE.
+Any user who can successfully authenticate can use DHE to push and pull Docker images.
+You can optionally filter the list of users to a subset of just those users with access to the DHE
+admin web interface.
+
+![Basic authentication settings page</admin/settings#auth>](../assets/admin-settings-authentication-basic.png)
+
+* A button to add one user, or to upload a CSV file containing username,
+password pairs
+* A DHE website Administrator Filter, allowing you to either
+* * *Allow all authenticated users*: to log into the DHE admin web interface, or
+* * *Whitelist usernames*: which allows you to restrict access to the web interface to a listed set of users.
+
+### LDAP authentication
+
+Using LDAP authentication allows you to integrate your DHE registry into your
+organization's existing user and authentication database.
+
+As this involves existing infrastructure external to DHE and Docker, you will need to
+gather the details required to configure DHE for your organization's particular LDAP
+implementation.
+
+You can test that you have the necessary LDAP server information by using it from
+inside a Docker container running on the same server as your DHE:
+
+> **Note**: if the LDAP server is configured to use *StartTLS*, then you need to add `-Z` to the
+> `ldapsearch` command examples below.
+
+```
+docker run --rm -it svendowideit/ldapsearch -h <LDAP Server hostname> -b <User Base DN> -D <Search User DN> -w <Search User Password>
+```
+
+or if the LDAP server is set up to allow anonymous access (which means your *Search User DN* and *Search User Password* settings can remain empty):
+
+```
+docker run --rm -it svendowideit/ldapsearch -h <LDAP Server hostname> -b <User Base DN> -x
+```
+
+The result of these queries should be a (very) long list - if you get an authentication error,
+then the details you have been given are not sufficient.
+
+The *User Login Attribute* key setting must match the field used in the LDAP server
+for the user's login-name. On OpenLDAP, it's generally `uid`, and on Microsoft Active Directory
+servers, it's `sAMAccountName`. The `ldapsearch` output above should allow you to
+confirm which setting you need.
+
+![LDAP authentication settings page</admin/settings#auth>](../assets/admin-settings-authentication-ldap.png)
+
+* *Use StartTLS*: defaults to unchecked, check to enable StartTLS
+* *LDAP Server URL*: **required** defaults to null, LDAP server URL (e.g., - ldap://example.com)
+* *User Base DN*: **required** defaults to null, user base DN in the form (e.g., - dc=example,dc=com)
+* *User Login Attribute*: **required** defaults to null, user login attribute (e.g., - uid or sAMAccountName)
+* *Search User DN*: **required** defaults to null, search user DN (e.g., - domain\username)
+* *Search User Password*: **required** defaults to null, search user password
+* A *DHE Registry User filter*: allowing you to either
+* * *Allow all authenticated users* to push or pull any images, or
+* * *Filter LDAP search results*: which allows you to restrict DHE registry pull and push to users matching the LDAP filter,
+* * *Whitelist usernames*: which allows you to restrict DHE registry pull and push to the listed set of users.
+* A *DHE website Administrator filter*, allowing you to either
+* * *Allow all authenticated users*: to log into the DHE admin web interface, or
+* * *Filter LDAP search results*: which allows you to restrict DHE admin web access to users matching the LDAP filter,
+* * *Whitelist usernames*: which allows you to restrict access to the web interface to the listed set of users.
+
+
+## Next Steps
+
+For information on getting support for DHE, take a look at the
+[Support information](./support.md).
+

docs/sources/docker-hub-enterprise/index.md

@@ -0,0 +1,59 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Overview
+page_description: Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry
+
+# Welcome to Docker Hub Enterprise
+
+## Overview
+
+Docker Hub Enterprise (DHE) lets you run and manage your own Docker image
+storage service, securely on your own infrastructure behind your company
+firewall. This allows you to securely store, push, and pull the images used by
+your enterprise to build, ship, and run applications. DHE also provides
+monitoring and usage information to help you understand the workloads being
+placed on it.
+
+Specifically, DHE provides:
+
+* An image registry to store, manage, and collaborate on Docker images
+* Pluggable storage drivers
+* Configuration options to let you run DHE in your particular enterprise
+environment.
+* Easy, transparent upgrades
+* Logging, usage and system health metrics
+
+DHE is perfect for:
+
+* Providing a secure, on-premise development environment
+* Creating a streamlined build pipeline
+* Building a consistent, high-performance test/QA environment
+* Managing image deployment
+
+DHE is built on [version 2 of the Docker registry](https://github.com/docker/distribution).
+
+> **Note:** This initial release of DHE has limited access. To get access,
+> you will need an account on [Docker Hub](https://hub.docker.com/). Once you're
+> logged in to the Hub with your account, visit the
+> [early access registration page](https://registry.hub.docker.com/earlyaccess/)
+> and follow the steps there to get signed up.
+
+## Available Documentation
+
+The following documentation for DHE is available:
+
+* **Overview** This page.
+* [**Quick Start: Basic User Workflow**](./quick-start.md) Go here to learn the
+fundamentals of how DHE works and how you can set up a simple, but useful
+workflow.
+* [**User Guide**](./userguide.md) Go here to learn about using DHE from day to
+day.
+* [**Administrator Guide**](./adminguide.md) Go here if you are an administrator
+responsible for running and maintaining DHE.
+* [**Installation**](install.md) Go here for the steps you'll need to install
+DHE and get it working.
+* [**Configuration**](./configuration.md) Go here to find out details about
+setting up and configuring DHE for your particular environment.
+* [**Support**](./support.md) Go here for information on getting support for
+DHE.
+

docs/sources/docker-hub-enterprise/install.md

@@ -0,0 +1,363 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Install
+page_description: Installation instructions for Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry
+
+# Installing Docker Hub Enterprise
+
+## Overview
+
+This document describes the process of obtaining, installing, and securing
+Docker Hub Enterprise (DHE). DHE is installed from Docker containers. Once
+installed, you will need to select a method of securing it. This doc will
+explain the options you have for security and help you find the resources needed
+to configure it according to your chosen method. More configuration details can
+be found in the [DHE Configuration page](./configuration.md).
+
+Specifically, installation requires completion of these steps, in order:
+
+1. Acquire a license by purchasing DHE or requesting a trial license.
+2. Install the commercially supported Docker Engine.
+3. Install DHE
+4. Add your license to your DHE instance
+
+> **Note:** This initial release of DHE has limited access. To get access,
+> you will need an account on [Docker Hub](https://hub.docker.com/). Once you're
+> logged in to the Hub with your account, visit the
+> [early access registration page](https://registry.hub.docker.com/earlyaccess/)
+> and follow the steps there to get signed up.
+
+## Licensing
+
+In order to run DHE, you will need to acquire a license, either by purchasing
+DHE or requesting a trial license. The license will be associated with your
+Docker Hub account or Docker Hub organization (so if you don't have an account,
+you'll need to set one up, which can be done at the same time as your license
+request). To get your license or start your trial, please contact our
+[sales department](mailto:sales@docker.com). Upon completion of your purchase or
+request, you will receive an email with further instructions for licensing your
+copy of DHE.
+
+## Prerequisites
+
+DHE 1.0.1 requires the following:
+
+* Commercially supported Docker Engine 1.6.1 or later running on an
+Ubuntu 14.04 LTS, RHEL 7.1 or RHEL 7.0 host. (See below for instructions on how
+to install the commercially supported Docker Engine.)
+
+> **Note:** In order to remain in compliance with your DHE support agreement,
+> you must use the current version of commercially supported Docker Engine.
+> Running the regular, open source version of Engine is **not** supported.
+
+* Your Docker daemon needs to be listening to the Unix socket (the default) so
+that it can be bind-mounted into the DHE management containers, allowing
+DHE to manage itself and its updates. For this reason, your DHE host will also
+need internet connectivity so it can access the updates.
+
+* Your host also needs to have TCP ports `80` and `443` available for the DHE
+container port mapping.
+
+* You will also need the Docker Hub user-name and password used when obtaining
+the DHE license (or the user-name of an administrator of the Hub organization
+that obtained an Enterprise license).
+
+## Installing the Commercially Supported Docker Engine
+
+Since DHE is installed using Docker, the commercially supported Docker Engine
+must be installed first. This is done with an RPM or DEB repository, which you
+set up using a Bash script downloaded from the [Docker Hub](https://hub.docker.com).
+
+### Download the commercially supported Docker Engine installation script
+
+To download the commercially supported Docker Engine Bash installation script,
+log in to the [Docker Hub](https://hub.docker.com) with the user-name used to
+obtain your license . Once you're logged in, go to the
+["Enterprise Licenses"](https://registry.hub.docker.com/account/licenses/) page
+in your Hub account's "Settings" section.
+
+Select your intended host operating system from the "Download CS Engine" drop-
+down at the top right of the page and then, once the Bash setup script is
+downloaded, follow the steps below appropriate for your chosen OS.
+
+![Docker Hub Docker engine install dropdown](../assets/docker-hub-org-enterprise-license-CSDE-dropdown.png)
+
+### RHEL 7.0/7.1 installation
+
+First, copy the downloaded Bash setup script to your RHEL host. Next, run the
+following to install commercially supported Docker Engine and its dependencies,
+and then start the Docker daemon:
+
+```
+$ sudo yum update && sudo yum upgrade
+$ chmod 755 docker-cs-engine-rpm.sh
+$ sudo ./docker-cs-engine-rpm.sh
+$ sudo yum install docker-engine-cs
+$ sudo systemctl enable docker.service
+$ sudo systemctl start docker.service
+```
+
+In order to simplify using Docker, you can get non-sudo access to the Docker
+socket by adding your user to the `docker` group, then logging out and back in
+again:
+
+```
+$ sudo usermod -a -G docker $USER
+$ exit
+```
+
+> **Note**: you may need to reboot your server to update its RHEL kernel.
+
+### Ubuntu 14.04 LTS installation
+
+First, copy the downloaded Bash setup script to your Ubuntu host. Next, run the
+following to install commercially supported Docker Engine and its dependencies:
+
+```
+$ sudo apt-get update && sudo apt-get upgrade
+$ sudo apt-get install -y linux-image-extra-virtual
+$ sudo reboot
+$ chmod 755 docker-cs-engine-deb.sh
+$ sudo ./docker-cs-engine-deb.sh
+$ sudo apt-get install docker-engine-cs
+```
+Lastly, confirm Docker is running with `sudo service docker start`.
+
+In order to simplify using Docker, you can get non-sudo access to the Docker
+socket by adding your user to the `docker` group, then logging out and back in
+again:
+
+```
+$ sudo usermod -a -G docker $USER
+$ exit
+```
+
+> **Note**: you may need to reboot your server to update its LTS kernel.
+
+## Upgrading the Commercially Supported Docker Engine
+
+CS Docker Engine 1.6.1 contains fixes to security vulnerabilities,
+  and customers should upgrade to it immediately.
+
+> **Note**: If you have CS Docker Engine 1.6.0 installed, it must be upgraded;
+  however, due to compatibility issues, [DHE must be upgraded](#upgrading-docker-hub-enterprise)
+  first.
+
+The CS Docker Engine installation script set up the RHEL/Ubuntu package repositories,
+so upgrading the Engine only requires you to run the update commands on your server.
+
+### RHEL 7.0/7.1 upgrade
+
+The following commands will stop the running DHE, upgrade CS Docker Engine,
+and then start DHE again:
+
+```
+    $ sudo bash -c "$(sudo docker run dockerhubenterprise/manager stop)"
+    $ sudo yum update
+    $ sudo systemctl daemon-reload && sudo systemctl restart docker
+    $ sudo bash -c "$(sudo docker run dockerhubenterprise/manager start)"
+```
+
+### Ubuntu 14.04 LTS upgrade
+
+The following commands will stop the running DHE, upgrade CS Docker Engine,
+and then start DHE again:
+
+```
+    $ sudo bash -c "$(sudo docker run dockerhubenterprise/manager stop)"
+    $ sudo apt-get update && sudo apt-get dist-upgrade docker-engine-cs
+    $ sudo bash -c "$(sudo docker run dockerhubenterprise/manager start)"
+```
+
+## Installing Docker Hub Enterprise
+
+Once the commercially supported Docker Engine is installed, you can install DHE
+itself. DHE is a self-installing application built and distributed using Docker
+and the [Docker Hub](https://registry.hub.docker.com/). It is able to restart
+and reconfigure itself using the Docker socket that is bind-mounted to its
+container.
+
+Start installing DHE by running the "dockerhubenterprise/manager" container:
+
+```
+	$ sudo bash -c "$(sudo docker run dockerhubenterprise/manager install)"
+```
+
+> **Note**: `sudo` is needed for `dockerhubenterprise/manager` commands to
+> ensure that the Bash script is run with full access to the Docker host.
+
+You can also find this command on the "Enterprise Licenses" section of your Hub
+user profile. The command will execute a shell script that creates the needed
+directories and then runs Docker to pull DHE's images and run its containers.
+
+Depending on your internet connection, this process may take several minutes to
+complete.
+
+A successful installation will pull a large number of Docker images and should
+display output similar to:
+
+```
+$ sudo bash -c "$(sudo docker run dockerhubenterprise/manager install)"
+Unable to find image 'dockerhubenterprise/manager:latest' locally
+Pulling repository dockerhubenterprise/manager
+c46d58daad7d: Pulling image (latest) from dockerhubenterprise/manager
+c46d58daad7d: Pulling image (latest) from dockerhubenterprise/manager
+c46d58daad7d: Pulling dependent layers
+511136ea3c5a: Download complete
+fa4fd76b09ce: Pulling metadata
+fa4fd76b09ce: Pulling fs layer
+ff2996b1faed: Download complete
+...
+fd7612809d57: Pulling metadata
+fd7612809d57: Pulling fs layer
+fd7612809d57: Download complete
+c46d58daad7d: Pulling metadata
+c46d58daad7d: Pulling fs layer
+c46d58daad7d: Download complete
+c46d58daad7d: Download complete
+Status: Downloaded newer image for dockerhubenterprise/manager:latest
+Unable to find image 'dockerhubenterprise/manager:1.0.0_8ce62a61e058' locally
+Pulling repository dockerhubenterprise/manager
+c46d58daad7d: Download complete
+511136ea3c5a: Download complete
+fa4fd76b09ce: Download complete
+1c8294cc5160: Download complete
+117ee323aaa9: Download complete
+2d24f826cb16: Download complete
+33bfc1956932: Download complete
+48f0dd6c9414: Download complete
+65c30f72ecb2: Download complete
+d4b29764d0d3: Download complete
+5654f4fe5384: Download complete
+9b9faa6ecd11: Download complete
+0c275f56ca5c: Download complete
+ff2996b1faed: Download complete
+fd7612809d57: Download complete
+Status: Image is up to date for dockerhubenterprise/manager:1.0.0_8ce62a61e058
+INFO  [1.0.0_8ce62a61e058] Attempting to connect to docker engine dockerHost="unix:///var/run/docker.sock"
+INFO  [1.0.0_8ce62a61e058] Running install command
+<...output truncated...>
+Creating container docker_hub_enterprise_load_balancer with docker daemon unix:///var/run/docker.sock
+Starting container docker_hub_enterprise_load_balancer with docker daemon unix:///var/run/docker.sock
+Bringing up docker_hub_enterprise_log_aggregator.
+Creating container docker_hub_enterprise_log_aggregator with docker daemon unix:///var/run/docker.sock
+Starting container docker_hub_enterprise_log_aggregator with docker daemon unix:///var/run/docker.sock
+$ docker ps
+CONTAINER ID        IMAGE                                                   COMMAND                CREATED             STATUS         PORTS                                      NAMES
+0168f37b6221        dockerhubenterprise/log-aggregator:1.0.0_8ce62a61e058   "log-aggregator"       4 seconds ago       Up 4 seconds                                              docker_hub_enterprise_log_aggregator
+b51c73bebe8b        dockerhubenterprise/nginx:1.0.0_8ce62a61e058            "nginxWatcher"         4 seconds ago       Up 4 seconds   0.0.0.0:80->80/tcp, 0.0.0.0:443->443/tcp   docker_hub_enterprise_load_balancer
+e8327864356b        dockerhubenterprise/admin-server:1.0.0_8ce62a61e058     "server"               5 seconds ago       Up 5 seconds   80/tcp                                     docker_hub_enterprise_admin_server
+52885a6e830a        dockerhubenterprise/auth_server:alpha-a5a2af8a555e      "garant --authorizat   6 seconds ago       Up 5 seconds   8080/tcp
+```
+
+Once this process completes, you should be able to manage and configure your DHE
+instance by pointing your browser to `https://<host-ip>/`.
+
+Your browser will warn you that this is an unsafe site, with a self-signed,
+untrusted certificate. This is normal and expected; allow this connection
+temporarily.
+
+### Setting the DHE Domain Name
+
+The DHE Administrator site will also warn that the "Domain Name" is not set. Go
+to the "Settings" tab, and set the "Domain Name" to the full host-name of your
+DHE server.
+Hitting the "Save and Restart DHE Server" button will generate a new certificate, which will be used
+by both the DHE Administrator web interface and the DHE Registry server.
+
+After the server restarts, you will again need to allow the connection to the untrusted DHE web admin site.
+
+![http settings page</admin/settings#http>](../assets/admin-settings-http-unlicensed.png)
+
+Lastly, you will see a warning notifying you that this instance of DHE is
+unlicensed. You'll correct this in the next step.
+
+### Add your license
+
+The DHE registry services will not start until you add your license.
+To do that, you'll first download your license from the Docker Hub and then
+upload it to your DHE web admin server. Follow these steps:
+
+1. If needed, log back into the [Docker Hub](https://hub.docker.com)
+   using the user-name you used when obtaining your license. Go to "Settings" (in
+   the menu under your user-name, top right) to get to your account settings, and
+   then click on "Enterprise Licenses" in the side bar at left.
+
+2. You'll see a list of available licenses. Click on the download button to
+   obtain the license file you'd like to use.
+   ![Download DHE license](../assets/docker-hub-org-enterprise-license.png)
+
+3. Next, go to your DHE instance in your browser and click on the Settings tab
+   and then the "License" tab. Click on the "Upload license file" button, which
+   will open a standard file browser. Locate and select the license file you
+   downloaded in step 2, above. Approve the selection to close the dialog.
+   ![http settings page</admin/settings#license>](../assets/admin-settings-license.png)
+
+4. Click the "Save and Restart DHE" button, which will quit DHE and then restart it, registering
+   the new license.
+
+5. Verify the acceptance of the license by confirming that the "unlicensed copy"
+warning is no longer present.
+
+### Securing DHE
+
+Securing DHE is **required**. You will not be able to push or pull from DHE until you secure it.
+
+There are several options and methods for securing DHE. For more information,
+see the [configuration documentation](./configuration.md#security)
+
+### Using DHE to push and pull images
+
+Now that you have DHE configured with a "Domain Name" and have your client
+Docker daemons configured with the required security settings, you can test your
+setup by following the instructions for
+[Using DHE to Push and pull images](./userguide.md#using-dhe-to-push-and-pull-images).
+
+### DHE web interface and registry authentication
+
+By default, there is no authentication set on either the DHE web admin
+interface or the DHE registry. You can restrict access using an in-DHE
+configured set of users (and passwords), or you can configure DHE to use LDAP-
+based authentication.
+
+See [DHE Authentication settings](./configuration.md#authentication) for more
+details.
+
+## Upgrading Docker Hub Enterprise
+
+DHE has been designed to allow on-the-fly software upgrades. Start by
+clicking on the "System Health" tab. In the upper, right-hand side of the
+dashboard, below the navigation bar, you'll see the currently installed version
+(e.g., `Current Version: 0.1.12345`).
+
+If your DHE instance is the latest available, you will also see the message:
+"System Up to Date."
+
+If there is an upgrade available, you will see the message "System Update
+Available!" alongside a button labeled "Update to Version X.XX". To upgrade, DHE
+will pull new DHE container images from the Docker Hub. If you have not already
+connected to Docker Hub, DHE will prompt you to log in.
+
+The upgrade process requires a small amount of downtime to complete. To complete
+the upgrade, DHE will:
+* Connect to the Docker Hub to pull new container images with the new version of
+DHE.
+* Deploy those containers
+* Shut down the old containers
+* Resolve any necessary links/urls.
+
+Assuming you have a decent internet connection, the entire upgrade process
+should complete within a few minutes.
+
+You should now [upgrade CS Docker Engine](#upgrading-the-commercially-supported-docker-engine).
+
+> **Note**: If Docker engine is upgraded first (DHE 1.0.0 on CS Docker Engine 1.6.1),
+> DHE can still be upgraded from the command line by running:
+>
+> `sudo bash -c "$(sudo docker run dockerhubenterprise/manager:1.0.0 upgrade 1.0.1)"`
+
+## Next Steps
+
+For information on configuring DHE for your environment, take a look at the
+[Configuration instructions](./configuration.md).
+

docs/sources/docker-hub-enterprise/quick-start.md

@@ -0,0 +1,331 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Quick-start: Basic Workflow
+page_description: Brief tutorial on the basics of Docker Hub Enterprise user workflow
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, image, repository
+
+
+# Docker Hub Enterprise Quick Start: Basic User Workflow
+
+## Overview
+
+This Quick Start Guide will give you a hands-on look at the basics of using
+Docker Hub Enterprise (DHE), Docker's on-premise image storage application.
+This guide will walk you through using DHE to complete a typical, and critical,
+part of building a development pipeline: setting up a Jenkins instance. Once you
+complete the task, you should have a good idea of how DHE works and how it might
+be useful to you.
+
+Specifically, this guide demonstrates the process of retrieving the
+[official Docker image for Jenkins](https://registry.hub.docker.com/_/jenkins/),
+customizing it to suit your needs, and then hosting it on your private instance
+of DHE located inside your enterprise's firewalled environment. Your developers
+will then be able to retrieve the custom Jenkins image in order to use it to
+build CI/CD infrastructure for their projects, no matter the platform they're
+working from, be it a laptop, a VM, or a cloud provider.
+
+The guide will walk you through the following steps:
+
+1. Pulling the official Jenkins image from the public Docker Hub
+2. Customizing the Jenkins image to suit your needs
+3. Pushing the customized image to DHE
+4. Pulling the customized image from DHE
+4. Launching a container from the custom image
+5. Using the new Jenkins container
+
+You should be able to complete this guide in about thirty minutes.
+
+> **Note:** This guide assumes you have installed a working instance of DHE
+> reachable at dhe.yourdomain.com. If you need help installing and configuring
+> DHE, please consult the
+[installation instructions](./install.md).
+
+
+## Pulling the official Jenkins image
+
+> **Note:** This guide assumes you are familiar with basic Docker concepts such
+> as images, containers, and registries. If you need to learn more about Docker
+> fundamentals, please consult the
+> [Docker user guide](https://docs.docker.com/userguide/).
+
+First, you will retrieve a copy of the official Jenkins image from the Docker Hub. By default, if
+Docker can't find an image locally, it will attempt to pull the image from the
+Docker Hub. From the CLI of a machine running the Docker Engine on your network, use
+the
+[`docker pull`](https://docs.docker.com/reference/commandline/cli/#pull)
+command to pull the public Jenkins image.
+
+    $ docker pull jenkins
+
+> **Note:** This guide assumes you can run Docker commands from a machine where
+> you are a member of the `docker` group, or have root privileges. Otherwise, you may
+> need to add `sudo` to the example commands below.
+
+Docker will start the process of pulling the image from the Hub. Once it has completed, the Jenkins image should be visible in the output of a [`docker images`](https://docs.docker.com/reference/commandline/cli/#images) command, which lists your available images:
+
+    $ docker images
+    REPOSITORY  TAG     IMAGE ID      CREATED      VIRTUAL SIZE
+    jenkins     latest  1a7cc22b0ee9  6 days ago   662 MB
+
+> **Note:** Because the `pull` command did not specify any tags, it will pull
+> the latest version of the public Jenkins image. If your enterprise environment
+> requires you to use a specific version, add the tag for the version you need
+> (e.g., `jenkins:1.565`).
+
+## Customizing the Jenkins image
+
+Now that you have a local copy of the Jenkins image, you'll customize it so that
+the containers it builds will integrate with your infrastructure. To do this,
+you'll create a custom Docker image that adds a Jenkins plugin that provides
+fine grained user management. You'll also configure Jenkins to be more secure by
+disabling HTTP access and forcing it to use HTTPS.
+You'll do this by using a `Dockerfile` and the `docker build` command.
+
+> **Note:** These are obviously just a couple of examples of the many ways you
+> can modify and configure Jenkins. Feel free to add or substitute whatever
+> customization is necessary to run Jenkins in your environment.
+
+### Creating a `build` context
+
+In order to add the new plugin and configure HTTPS access to the custom Jenkins
+image, you need to:
+
+1. Create text file that defines the new plugin
+2. Create copies of the private key and certificate
+
+All of the above files need to be in the same directory as the Dockerfile you
+will create in the next step.
+
+1. Create a build directory called `build`, and change to that new directory:
+
+    $ mkdir build && cd build
+
+In this directory, create a new file called `plugins` and add the following
+line:
+
+    role-strategy:2.2.0
+
+(The plugin version used above was the latest version at the time of writing.)
+
+2. You will also need to make copies of the server's private key and certificate. Give the copies the following names - `https.key` and `https.pem`.
+
+> **Note:** Because creating new keys varies widely by platform and
+> implementation, this guide won't cover key generation. We assume you have
+> access to existing keys. If you don't have access, or can't generate keys
+> yourself, feel free to skip the steps involving them and HTTPS config. The
+> guide will still walk you through building a custom Jenkins image and pushing
+> and pulling that image using DHE.
+
+### Creating a Dockerfile
+
+In the same directory as the `plugins` file and the private key and certificate,
+create a new [`Dockerfile`](https://docs.docker.com/reference/builder/) with the
+following contents:
+
+     FROM jenkins
+
+     #New plugins must be placed in the plugins file
+     COPY plugins /usr/share/jenkins/plugins
+
+     #The plugins.sh script will install new plugins
+     RUN /usr/local/bin/plugins.sh /usr/share/jenkins/plugins
+
+     #Copy private key and cert to image
+     COPY https.pem /var/lib/jenkins/cert
+     COPY https.key /var/lib/jenkins/pk
+
+     #Configure HTTP off and HTTPS on, using port 1973
+    ENV JENKINS_OPTS --httpPort=-1 --httpsPort=1973 --httpsCertificate=/var/lib/jenkins/cert --httpsPrivateKey=/var/lib/jenkins/pk
+
+The first `COPY` instruction in the above will copy the `plugin` file created
+earlier into the `/usr/share/jenkins` directory within the custom image you are
+defining with the `Dockerfile`.
+
+The `RUN` instruction will execute the `/usr/local/bin/plugins.sh` script with
+the newly copied `plugins` file, which will install the listed plugin.
+
+The next two `COPY` instructions copy the server's private key and certificate
+into the required directories within the new image.
+
+The `ENV` instruction creates an environment variable called `JENKINS_OPT` in
+the image you are about to create. This environment variable will be present in
+any containers launched form the image and contains the required settings to
+tell Jenkins to disable HTTP and operate over HTTPS.
+
+> **Note:** You can specify any valid port number as part of the `JENKINS_OPT`
+> environment variable declared above. The value `1973` used in the example is
+> arbitrary.
+
+The `Dockerfile`, the `plugins` file, as well as the private key and
+certificate, must all be in the same directory because the `docker build`
+command uses the directory that contains the `Dockerfile` as its "build
+context". Only files contained within that "build context" will be included in
+the image being built.
+
+### Building your custom image
+
+Now that the `Dockerfile`, the `plugins` file, and the files required for HTTPS
+operation are created in your current working directory, you can build your
+custom image using the
+[`docker build` command](https://docs.docker.com/reference/commandline/cli/#build):
+
+    docker build -t dhe.yourdomain.com/ci-infrastructure/jnkns-img .
+
+> **Note:** Don't miss the period (`.`) at the end of the command above. This
+> tells the `docker build` command to use the current working directory as the
+> "build context".
+
+This command will build a new Docker image called `jnkns-img` which is based on
+the public Jenkins image you pulled earlier, but contains all of your
+customization.
+
+Please note the use of the `-t` flag in the `docker build` command above. The
+`-t` flag lets you  tag an image so it can be pushed to a custom repository. In
+the example above, the new image is tagged so it can be pushed to the
+`ci-infrastructure` Repository within the `dhe.yourdomain.com` registry (your
+local DHE instance). This will be important when you need to `push` the
+customized image to DHE later.
+
+A `docker images` command will now show the custom image alongside the Jenkins
+image pulled earlier:
+
+    $ sudo docker images
+    REPOSITORY   TAG    IMAGE ID    CREATED    VIRTUAL SIZE
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img    latest    fc0ab3008d40    2 minutes ago    674.5 MB
+    jenkins    latest    1a7cc22b0ee9    6 days ago    662 MB
+
+## Pushing to Docker Hub Enterprise
+
+> **Note**: If your DHE instance has authentication enabled, you will need to
+> use your command line to `docker login <dhe-hostname>` (e.g., `docker login
+> dhe.yourdomain.com`).
+>
+> Failures due to unauthenticated `docker push` and `docker pull` commands will
+> look like :
+>
+>     $ docker pull dhe.yourdomain.com/hello-world
+>     Pulling repository dhe.yourdomain.com/hello-world
+>     FATA[0001] Error: image hello-world:latest not found
+>
+>     $ docker push dhe.yourdomain.com/hello-world
+>     The push refers to a repository [dhe.yourdomain.com/hello-world] (len: 1)
+>     e45a5af57b00: Image push failed
+>     FATA[0001] Error pushing to registry: token auth attempt for registry
+>     https://dhe.yourdomain.com/v2/:
+>     https://dhe.yourdomain.com/auth/v2/token/
+>     ?scope=repository%3Ahello-world%3Apull%2Cpush&service=dhe.yourdomain.com
+>     request failed with status: 401 Unauthorized
+
+Now that you've created the custom image, it can be pushed to DHE using the
+[`docker push`command](https://docs.docker.com/reference/commandline/cli/#push):
+
+    $ docker push dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    511136ea3c5a: Image successfully pushed
+    848d84b4b2ab: Image successfully pushed
+    71d9d77ae89e: Image already exists
+    <truncated ouput...>
+    492ed3875e3e: Image successfully pushed
+    fc0ab3008d40: Image successfully pushed
+
+You can view the traffic throughput while the custom image is being pushed from
+the `System Health` tab in DHE:
+
+![DHE console push throughput](../assets/console-push.png)
+
+Once the image is successfully pushed, it can be downloaded, or pulled, by any
+Docker host that has access to DHE.
+
+## Pulling from Docker Hub Enterprise
+To pull the `jnkns-img` image from DHE, run the
+[`docker pull`](https://docs.docker.com/reference/commandline/cli/#pull)
+command from any Docker Host that has access to your DHE instance:
+
+    $ docker pull dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    latest: Pulling from dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    511136ea3c5a: Pull complete
+    848d84b4b2ab: Pull complete
+    71d9d77ae89e: Pull complete
+    <truncated ouput...>
+    492ed3875e3e: Pull complete
+    fc0ab3008d40: Pull complete
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
+    Status: Downloaded newer image for dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest
+
+You can view the traffic throughput while the custom image is being pulled from
+the `System Health` tab in DHE:
+
+![DHE console pull throughput](../assets/console-pull.png)
+
+Now that the `jnkns-img` image has been pulled locally from DHE, you can view it
+in the output of the `docker images` command:
+
+     $ docker images
+    REPOSITORY     TAG    IMAGE ID    CREATED    VIRTUAL SIZE
+    dhe.yourdomain.com/ci-infrastructure/jnkns-img    latest  fc0ab3008d40    8 minutes ago    674.5 MB
+
+## Launching a custom Jenkins container
+
+Now that you've successfully pulled the customized Jenkins image from DHE, you
+can create a container from it with the
+[`docker run` command](https://docs.docker.com/reference/commandline/cli/#run):
+
+
+    $ docker run -p 1973:1973 --name jenkins01 dhe.yourdomain.com/ci-infrastructure/jnkns-img
+    /usr/share/jenkins/ref/init.groovy.d/tcp-slave-angent-port.groovy
+     /usr/share/jenkins/ref/init.groovy.d/tcp-slave-angent-port.groovy -> init.groovy.d/tcp-slave-angent-port.groovy
+    copy init.groovy.d/tcp-slave-angent-port.groovy to JENKINS_HOME
+    /usr/share/jenkins/ref/plugins/role-strategy.hpi
+     /usr/share/jenkins/ref/plugins/role-strategy.hpi -> plugins/role-strategy.hpi
+    copy plugins/role-strategy.hpi to JENKINS_HOME
+    /usr/share/jenkins/ref/plugins/dockerhub.hpi
+     /usr/share/jenkins/ref/plugins/dockerhub.hpi -> plugins/dockerhub.hpi
+    copy plugins/dockerhub.hpi to JENKINS_HOME
+    <truncated output...>
+    INFO: Jenkins is fully up and running
+
+> **Note:** The `docker run` command above maps port 1973 in the container
+> through to port 1973 on the host. This is the HTTPS port you specified in the
+> Dockerfile earlier. If you specified a different HTTPS port in your
+> Dockerfile, you will need to substitute this with the correct port numbers for
+> your environment.
+
+You can view the newly launched a container, called `jenkins01`, using the
+[`docker ps` command](https://docs.docker.com/reference/commandline/cli/#ps):
+
+    $ docker ps
+    CONTAINER ID     IMAGE     COMMAND     CREATED      STATUS  ...PORTS     NAMES
+    2e5d2f068504    dhe.yourdomain.com/ci-infrastructure/jnkns-img:latest    "/usr/local/bin/jenk     About a minute ago     Up About a minute     50000/tcp, 0.0.0.0:1973->1973/tcp     jenkins01
+
+
+## Accessing the new Jenkins container
+
+The previous `docker run` command mapped port `1973` on the container to port
+`1973` on the Docker host, so the Jenkins Web UI can be accessed at
+`https://<docker-host>:1973` (Don't forget the `s` at the end of `https`.)
+
+> **Note:** If you are using a self-signed certificate, you may get a security
+> warning from your browser telling you that the certificate is self-signed and
+> not trusted. You may wish to add the certificate to the trusted store in order
+> to prevent further warnings in the future.
+
+![Jenkins landing page](../assets/jenkins-ui.png)
+
+From within the Jenkins Web UI, navigate to `Manage Jenkins` (on the left-hand
+pane) > `Manage Plugins` > `Installed`. The  `Role-based Authorization Strategy`
+plugin should be present with the `Uninstall` button available to the right.
+
+![Jenkins plugin manager](../assets/jenkins-plugins.png)
+
+In another browser session, try to access Jenkins via the default HTTP port 8080
+ `http://<docker-host>:8080`. This should result in a "connection timeout",
+showing that Jenkins is not available on its default port 8080 over HTTP.
+
+This demonstration shows your Jenkins image has been configured correctly for
+HTTPS access, your new plugin was added and is ready for use, and HTTP access
+has been disabled. At this point, any member of your team can use `docker pull`
+to access the image from your DHE instance, allowing them to access a
+configured, secured Jenkins instance that can run on any infrastructure.
+
+## Next Steps
+
+For more information on using DHE, take a look at the
+[User's Guide](./userguide.md).

docs/sources/docker-hub-enterprise/release-notes.md

@@ -0,0 +1,241 @@
+no_version_dropdown: true
+page_title: Docker Hub Enterprise: Release notes
+page_description: Release notes for Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, release
+
+# Release Notes
+
+## Docker Hub Enterprise
+
+### DHE 1.0.1
+(11 May 2015)
+
+- Addresses compatibility issue with 1.6.1 CS Docker Engine
+
+### DHE 1.0.0
+(23 Apr 2015)
+
+- First release
+
+## Commercially Supported Docker Engine
+
+### CS Docker Engine 1.6.2-cs5
+(21 May 2015)
+
+For customers running Docker Engine on [supported versions of RedHat Enterprise
+Linux](https://www.docker.com/enterprise/support/) with [SELinux
+enabled](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/
+6/html/Security-Enhanced_Linux/sect-Security-Enhanced_Linux-Working_with_SELinux
+-Enabling_and_Disabling_SELinux.html), the `docker build` and `docker run`
+commands will not have DNS host name resolution and bind-mounted volumes may
+not be accessible.
+As a result, customers with SELinux will be unable to use hostname-based network
+access in either `docker build` or `docker run`, nor will they be able to
+`docker run` containers
+that use `--volume` or `-v` bind-mounts (with an incorrect SELinux label) in
+their environment. By installing Docker
+Engine 1.6.2-cs5, customers can use Docker as intended on RHEL with SELinux enabled.
+
+For example, you see will failures like:
+
+```
+[root@dhe ~]# docker -v
+Docker version 1.6.0-cs2, build b8dd430
+[root@dhe ~]# ping dhe.home.org.au
+PING dhe.home.org.au (10.10.10.104) 56(84) bytes of data.
+64 bytes from dhe.home.gateway (10.10.10.104): icmp_seq=1 ttl=64 time=0.663 ms
+^C
+--- dhe.home.org.au ping statistics ---
+2 packets transmitted, 2 received, 0% packet loss, time 1001ms
+rtt min/avg/max/mdev = 0.078/0.370/0.663/0.293 ms
+[root@dhe ~]# docker run --rm -it debian ping dhe.home.org.au
+ping: unknown host
+[root@dhe ~]# docker run --rm -it debian cat /etc/resolv.conf
+cat: /etc/resolv.conf: Permission denied
+[root@dhe ~]# docker run --rm -it debian apt-get update
+Err http://httpredir.debian.org jessie InRelease
+
+Err http://security.debian.org jessie/updates InRelease
+
+Err http://httpredir.debian.org jessie-updates InRelease
+
+Err http://security.debian.org jessie/updates Release.gpg
+  Could not resolve 'security.debian.org'
+Err http://httpredir.debian.org jessie Release.gpg
+  Could not resolve 'httpredir.debian.org'
+Err http://httpredir.debian.org jessie-updates Release.gpg
+  Could not resolve 'httpredir.debian.org'
+[output truncated]
+
+```
+
+or when running a `docker build`:
+
+```
+[root@dhe ~]# docker build .
+Sending build context to Docker daemon 11.26 kB
+Sending build context to Docker daemon
+Step 0 : FROM fedora
+ ---> e26efd418c48
+Step 1 : RUN yum install httpd
+ ---> Running in cf274900ea35
+
+One of the configured repositories failed (Fedora 21 - x86_64),
+and yum doesn't have enough cached data to continue. At this point the only
+safe thing yum can do is fail. There are a few ways to work "fix" this:
+
+[output truncated]
+```
+
+
+**Affected Versions**: All previous versions of Docker Engine when SELinux
+is enabled.
+
+Docker **highly recommends** that all customers running previous versions of
+Docker Engine update to this release.
+
+#### **How to workaround this issue**
+
+Customers who choose not to install this update have two options. The
+first option is to disable SELinux. This is *not recommended* for production
+systems where SELinux is typically required.
+
+The second option is to pass the following parameter in to `docker run`.
+
+  	     --security-opt=label:type:docker_t
+
+This parameter cannot be passed to the `docker build` command.
+
+#### **Upgrade notes**
+
+When upgrading, make sure you stop DHE first, perform the Engine upgrade, and
+then restart DHE.
+
+If you are running with SELinux enabled, previous Docker Engine releases allowed
+you to bind-mount additional volumes or files inside the container as follows:
+
+		$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro <imagename>
+
+In the 1.6.2-cs5 release, you must ensure additional bind-mounts have the correct
+SELinux context. For example, if you want to mount `foobar.txt` as read-only
+into the container, do the following to create and test your bind-mount:
+
+1. Add the `z` option to the bind mount when you specify `docker run`.
+
+		$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro,z <imagename>
+
+2. Exec into your new container.
+
+	For example, if your container is `bashful_curie`, open a shell on the
+	container:
+
+		$ docker exec -it bashful_curie bash
+
+3. Use `cat` to check the permissions on the mounted file.
+
+		$ cat /foobar.txt
+		the contents of foobar appear
+
+	If you see the file's contents, your mount succeeded. If you receive a
+	`Permission denied` message and/or the `/var/log/audit/audit.log` file on
+	your Docker host contains an AVC Denial message, the mount did not succeed.
+
+		type=AVC msg=audit(1432145409.197:7570): avc:  denied  { read } for  pid=21167 comm="cat" name="foobar.txt" dev="xvda2" ino=17704136 scontext=system_u:system_r:svirt_lxc_net_t:s0:c909,c965 tcontext=unconfined_u:object_r:user_home_t:s0 tclass=file
+
+	Recheck your command line to make sure you passed in the `z` option.
+
+
+### CS Docker Engine 1.6.2-cs4
+(13 May 2015)
+
+Fix mount regression for `/sys`.
+
+### CS Docker Engine 1.6.1-cs3
+(11 May 2015)
+
+Docker Engine version 1.6.1 has been released to address several vulnerabilities
+and is immediately available for all supported platforms. Users are advised to
+upgrade existing installations of the Docker Engine and use 1.6.1 for new installations.
+
+It should be noted that each of the vulnerabilities allowing privilege escalation
+may only be exploited by a malicious Dockerfile or image.  Users are advised to
+run their own images and/or images built by trusted parties, such as those in
+the official images library.
+
+Please send any questions to security@docker.com.
+
+
+#### **[CVE-2015-3629](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3629) Symlink traversal on container respawn allows local privilege escalation**
+
+Libcontainer version 1.6.0 introduced changes which facilitated a mount namespace
+breakout upon respawn of a container. This allowed malicious images to write
+files to the host system and escape containerization.
+
+Libcontainer and Docker Engine 1.6.1 have been released to address this
+vulnerability. Users running untrusted images are encouraged to upgrade Docker Engine.
+
+Discovered by Tõnis Tiigi.
+
+
+#### **[CVE-2015-3627](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3627) Insecure opening of file-descriptor 1 leading to privilege escalation**
+
+The file-descriptor passed by libcontainer to the pid-1 process of a container
+has been found to be opened prior to performing the chroot, allowing insecure
+open and symlink traversal. This allows malicious container images to trigger
+a local privilege escalation.
+
+Libcontainer and Docker Engine 1.6.1 have been released to address this
+vulnerability. Users running untrusted images are encouraged to upgrade
+Docker Engine.
+
+Discovered by Tõnis Tiigi.
+
+#### **[CVE-2015-3630](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3630) Read/write proc paths allow host modification & information disclosure**
+
+Several paths underneath /proc were writable from containers, allowing global
+system manipulation and configuration. These paths included `/proc/asound`,
+`/proc/timer_stats`, `/proc/latency_stats`, and `/proc/fs`.
+
+By allowing writes to `/proc/fs`, it has been noted that CIFS volumes could be
+forced into a protocol downgrade attack by a root user operating inside of a
+container. Machines having loaded the timer_stats module were vulnerable to
+having this mechanism enabled and consumed by a container.
+
+We are releasing Docker Engine 1.6.1 to address this vulnerability. All
+versions up to 1.6.1 are believed vulnerable. Users running untrusted
+images are encouraged to upgrade.
+
+Discovered by Eric Windisch of the Docker Security Team.
+
+#### **[CVE-2015-3631](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3631) Volume mounts allow LSM profile escalation**
+
+By allowing volumes to override files of `/proc` within a mount namespace, a user
+could specify arbitrary policies for Linux Security Modules, including setting
+an unconfined policy underneath AppArmor, or a `docker_t` policy for processes
+managed by SELinux. In all versions of Docker up until 1.6.1, it is possible for
+malicious images to configure volume mounts such that files of proc may be overridden.
+
+We are releasing Docker Engine 1.6.1 to address this vulnerability. All versions
+up to 1.6.1 are believed vulnerable. Users running untrusted images are encouraged
+to upgrade.
+
+Discovered by Eric Windisch of the Docker Security Team.
+
+#### **AppArmor policy improvements**
+
+The 1.6.1 release also marks preventative additions to the AppArmor policy.
+Recently, several CVEs against the kernel have been reported whereby mount
+namespaces could be circumvented through the use of the sys_mount syscall from
+inside of an unprivileged Docker container. In all reported cases, the
+AppArmor policy included in libcontainer and shipped with Docker has been
+sufficient to deflect these attacks. However, we have deemed it prudent to
+proactively tighten the policy further by outright denying the use of the
+`sys_mount` syscall.
+
+Because this addition is preventative, no CVE-ID is requested.
+
+### CS Docker Engine 1.6.0-cs2
+(23 Apr 2015)
+
+- First release, please see the [Docker Engine 1.6.0 Release notes](/release-notes/)
+  for more details.

docs/sources/docker-hub-enterprise/support.md

@@ -0,0 +1,16 @@
+page_title: Docker Hub Enterprise: Support
+page_description: Commercial Support
+page_keywords: docker, documentation, about, technology, understanding, enterprise, hub, registry, support
+
+# Commercial Support Options
+
+## How to get support
+
+Purchasing a DHE License or Commercial Support subscription means your questions
+and issues about DHE will receive prioritized support.
+You can file a ticket through [email](mailto:support@docker.com) from your
+company email address, or visit our [support site](https://support.docker.com).
+In either case, you'll need to verify your email address, and then you can
+communicate with the support team either by email or web interface.
+
+**The availability of support depends on your [support subscription](https://www.docker.com/enterprise/support/)**

docs/sources/docker-hub-enterprise/userguide.md

@@ -0,0 +1,126 @@
+page_title: Docker Hub Enterprise: User guide
+page_description: Documentation describing basic use of Docker Hub Enterprise
+page_keywords: docker, documentation, about, technology, hub, enterprise
+
+
+# Docker Hub Enterprise User's Guide
+
+This guide covers tasks and functions a user of Docker Hub Enterprise (DHE) will
+need to know about, such as pushing or pulling images, etc. For tasks DHE
+administrators need to accomplish, such as configuring or monitoring DHE, please
+visit the [Administrator's Guide](./adminguide.md).
+
+## Overview
+
+The primary use case for DHE users is to push and pull images to and from the
+DHE image storage service. For example, you might pull an Official Image for
+Ubuntu from the Docker Hub, customize it with configuration settings for your
+infrastructure and then push it to your DHE image storage for other developers
+to pull and use for their development environments.
+
+Pushing and pulling images with DHE works very much like any other Docker
+registry: you use the `docker pull` command to retrieve images and the `docker
+push` command to add an image to a DHE repository. To learn more about Docker
+images, see
+[User Guide: Working with Docker Images](https://docs.docker.com/userguide/dockerimages/). For a step-by-step
+example of the entire process, see the
+[Quick Start: Basic Workflow Guide](./quick-start.md).
+
+> **Note**: If your DHE instance has authentication enabled, you will need to
+>use your command line to `docker login <dhe-hostname>` (e.g., `docker login
+> dhe.yourdomain.com`).
+>
+> Failures due to unauthenticated `docker push` and `docker pull` commands will
+> look like :
+>
+>     $ docker pull dhe.yourdomain.com/hello-world
+>     Pulling repository dhe.yourdomain.com/hello-world
+>     FATA[0001] Error: image hello-world:latest not found
+>
+>     $ docker push dhe.yourdomain.com/hello-world
+>     The push refers to a repository [dhe.yourdomain.com/hello-world] (len: 1)
+>     e45a5af57b00: Image push failed
+>     FATA[0001] Error pushing to registry: token auth attempt for registry
+>     https://dhe.yourdomain.com/v2/:
+>     https://dhe.yourdomain.com/auth/v2/token/?scope=
+>     repository%3Ahello-world%3Apull%2Cpush&service=dhe.yourdomain.com
+>     request failed with status: 401 Unauthorized
+
+## Pushing Images
+
+You push an image up to a DHE repository by using the
+[`docker push` command](https://docs.docker.com/reference/commandline/cli/#push).
+
+You can add a `tag` to your image so that you can more easily identify it
+amongst other variants and so that it refers to your DHE server.
+
+    `$ docker tag hello-world:latest dhe.yourdomain.com/yourusername/hello-mine:latest`
+
+The command labels a `hello-world:latest` image using a new tag in the
+`[REGISTRYHOST/][USERNAME/]NAME[:TAG]` format.  The `REGISTRYHOST` in this
+case is your DHE server, `dhe.yourdomain.com`, and the `USERNAME` is
+`yourusername`. Lastly, the image tag is set to `hello-mine:latest`.
+
+Once an image is tagged, you can push it to DHE with:
+
+    `$ docker push dhe.yourdomain.com/demouser/hello-mine:latest`
+    
+> **Note**: If the Docker daemon on which you are running `docker push` doesn't
+> have the right certificates set up, you will get an error similar to:
+>
+>     $ docker push dhe.yourdomain.com/demouser/hello-world
+>     FATA[0000] Error response from daemon: v1 ping attempt failed with error:
+>     Get https://dhe.yourdomain.com/v1/_ping: x509: certificate signed by
+>     unknown authority. If this private registry supports only HTTP or HTTPS
+>     with an unknown CA certificate, please add `--insecure-registry
+>     dhe.yourdomain.com` to the daemon's arguments. In the case of HTTPS, if
+>     you have access to the registry's CA certificate, no need for the flag;
+>     simply place the CA certificate at
+>     /etc/docker/certs.d/dhe.yourdomain.com/ca.crt
+
+## Pulling images
+
+You can retrieve an image with the
+[`docker pull` command](https://docs.docker.com/reference/commandline/cli/#run),
+or you can retrieve an image and run Docker to build the container with the
+[`docker run`command](https://docs.docker.com/reference/commandline/cli/#run).
+
+To retrieve an image from DHE and then run Docker to build the container, add
+the needed info to `docker run`:
+
+        $ docker run dhe.yourdomain.com/yourusername/hello-mine
+        latest: Pulling from dhe.yourdomain.com/yourusername/hello-mine
+        511136ea3c5a: Pull complete
+        31cbccb51277: Pull complete
+        e45a5af57b00: Already exists
+        Digest: sha256:45f0de377f861694517a1440c74aa32eecc3295ea803261d62f950b1b757bed1
+        Status: Downloaded newer image for dhe.yourdomain.com/demouser/hello-mine:latest
+
+Note that if you don't specify a version, by default the `latest` version of an
+image will be pulled.
+
+If you run `docker images` after this you'll see a `hello-mine` image.
+
+        $ docker images
+        REPOSITORY                           TAG     IMAGE ID      CREATED       VIRTUAL SIZE
+        dhe.yourdomain.com/yourusername/hello-mine  latest  e45a5af57b00  3 months ago  910 B
+
+To pull an image without building the container, use `docker pull` and specify
+your DHE registry by adding it to the command:
+
+     $ docker pull dhe.yourdomain.com/yourusername/hello-mine
+
+
+## Next Steps
+
+For information on administering DHE, take a look at the
+[Administrator's Guide](./adminguide.md).
+
+
+<!--TODO:
+
+* mention that image aliases that are not in the same repository are not updated - either on push or pull
+* but that multiple tags in one repo are pushed if you don't specify the `:tag` (ie, `imagename` does not always mean `imagename:latest`)
+* show what happens for non-latest, and when there are more than one tag in a repo
+* explain the fully-qualified repo/image name
+* explain how to remove an image from DHE -->

docs/sources/docker-hub/accounts.md

@@ -1,13 +1,6 @@
-<!--[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"
-weight = 1
-+++
-<![end-metadata]-->
+page_title: Accounts on Docker Hub
+page_description: Docker Hub accounts
+page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
 
 # Accounts on Docker Hub
 

docs/sources/docker-hub/builds.md

@@ -1,13 +1,6 @@
-<!--[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"
-weight = 3
-+++
-<![end-metadata]-->
+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
 
 # Automated Builds on Docker Hub
 

docs/sources/docker-hub/home.md

@@ -1,13 +1,6 @@
-<!--[metadata]>
-+++
-draft = true
-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]-->
+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
 
 # The Docker Hub Registry help