Updates for 0.7.0 Release

- Close docker#194 and fix
- Fix and close docker#425
- Fix and close docker#417
- Fix and close docker#420
- Fix and close docker#422
- Adding in documentation build scripts
- Fix and close docker#431
- Fix and close docker#438, and Fix and close docker#429
- Work on 441
- Adding in commands reference
- Updating all the options to tables
- Updating per Vivek docker#498
- Adding vivek's last suggestions

Signed-off-by: Mary Anthony <[email protected]>

Dockerfile

@@ -0,0 +1,17 @@
+FROM docs/base:hugo-github-linking
+MAINTAINER Mary Anthony <[email protected]> (@moxiegirl)
+
+# RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
+#RUN svn checkout https://github.com/swarm/opensource/trunk/docs /docs/content/swarm
+# RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
+#RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
+#RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
+#RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
+#RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
+#RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
+
+ENV PROJECT=ucp
+# to get the git info for this repo
+COPY . /src
+
+COPY . /docs/content/$PROJECT/

Makefile

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

certs.md

@@ -1,8 +1,7 @@
-
 +++
-title = "Manually setting up a CA"
-description = "Docker Universal Control Plane"
-[menu.ucp]
+title ="Manually setting up a CA"
+description="Docker Universal Control Plane"
+[menu.main]
 +++
 
 

index.md

@@ -1,7 +1,7 @@
 +++
-title = "Docker Universal Control Plane"
-description = "Docker Universal Control Plane"
-[menu.ucp]
+title ="Docker Universal Control Plane"
+description="Docker Universal Control Plane"
+[menu.main]
 identifier="mn_ucp"
 weight="-100"
 +++
@@ -17,4 +17,4 @@ The following are available:
 * [Manually setting up a CA](certs)  
 * [Set up container networking with UCP](networking)  
 * [Set up high availability](understand_ha)  
-* [UCP Support Dumps](support)
+* [Work with Docker Support](support)