Skip to content

Commit e44f5d8

Browse files
Mary AnthonyJoao Fernandes
Mary Anthony
authored and
Joao Fernandes
committed
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]>
1 parent 7db22de commit e44f5d8

22 files changed

+669
-190
lines changed

‎Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM docs/base:hugo-github-linking
2+
MAINTAINER Mary Anthony <[email protected]> (@moxiegirl)
3+
4+
# RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
5+
#RUN svn checkout https://github.com/swarm/opensource/trunk/docs /docs/content/swarm
6+
# RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
7+
#RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
8+
#RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
9+
#RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
10+
#RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
11+
#RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
12+
13+
ENV PROJECT=ucp
14+
# to get the git info for this repo
15+
COPY . /src
16+
17+
COPY . /docs/content/$PROJECT/

‎Makefile

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-unit test-integration test-integration-cli test-docker-py validate
2+
3+
# env vars passed through directly to Docker's build scripts
4+
# to allow things like `make DOCKER_CLIENTONLY=1 binary` easily
5+
# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
6+
DOCKER_ENVS := \
7+
-e BUILDFLAGS \
8+
-e DOCKER_CLIENTONLY \
9+
-e DOCKER_EXECDRIVER \
10+
-e DOCKER_GRAPHDRIVER \
11+
-e TESTDIRS \
12+
-e TESTFLAGS \
13+
-e TIMEOUT
14+
# 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
15+
16+
# to allow `make DOCSDIR=docs docs-shell` (to create a bind mount in docs)
17+
DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR)/$(DOCSDIR):/$(DOCSDIR))
18+
19+
# to allow `make DOCSPORT=9000 docs`
20+
DOCSPORT := 8000
21+
22+
# Get the IP ADDRESS
23+
DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
24+
HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
25+
HUGO_BIND_IP=0.0.0.0
26+
27+
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
28+
DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
29+
DOCKER_DOCS_IMAGE := docs-base$(if $(GIT_BRANCH),:$(GIT_BRANCH))
30+
31+
32+
DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
33+
34+
# for some docs workarounds (see below in "docs-build" target)
35+
GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
36+
37+
default: docs
38+
39+
docs: docs-build
40+
$(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)
41+
42+
docs-draft: docs-build
43+
$(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)
44+
45+
46+
docs-shell: docs-build
47+
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
48+
49+
50+
docs-build:
51+
# ( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs ./ > ./changed-files
52+
# echo "$(GIT_BRANCH)" > GIT_BRANCH
53+
# echo "$(AWS_S3_BUCKET)" > AWS_S3_BUCKET
54+
# echo "$(GITCOMMIT)" > GITCOMMIT
55+
docker build -t "$(DOCKER_DOCS_IMAGE)" .

‎bootstrap/install.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎bootstrap/join.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎bootstrap/upgrade.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎certs.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
21
+++
3-
title = "Manually setting up a CA"
4-
description = "Docker Universal Control Plane"
5-
[menu.ucp]
2+
title ="Manually setting up a CA"
3+
description="Docker Universal Control Plane"
4+
[menu.main]
65
+++
76

87

‎index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
+++
2-
title = "Docker Universal Control Plane"
3-
description = "Docker Universal Control Plane"
4-
[menu.ucp]
2+
title ="Docker Universal Control Plane"
3+
description="Docker Universal Control Plane"
4+
[menu.main]
55
identifier="mn_ucp"
66
weight="-100"
77
+++
@@ -17,4 +17,4 @@ The following are available:
1717
* [Manually setting up a CA](certs)
1818
* [Set up container networking with UCP](networking)
1919
* [Set up high availability](understand_ha)
20-
* [UCP Support Dumps](support)
20+
* [Work with Docker Support](support)

0 commit comments

Comments
 (0)