Commit Graph

20 Commits

Author SHA1 Message Date
yuexiao-wang bf3d1d1e5a keep the same between rules and PHONY
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-19 09:08:39 +08:00
Sven Dowideit ad538f6465 Add make test and other small cleanups
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-25 18:30:01 +00:00
Sebastiaan van Stijn 9552e24af6
fix docs not building if branch-name contains slashes
similar to the changes made in a4192471cd,
clean the branch-name before using it as a tag-name
for the image that's built.

this also changes the "image name" for docs images
being built from "docs-base" to "docker-docs", to
be in line with the main Makefile

before this change:

  /usr/bin/make -C docs docs
  docker build -t "docs-base:docs/slashes" .
  invalid value "docs-base:docs/slashes" for flag -t: Error parsing reference: "docs-base:docs/slashes" is not a valid repository/tag
  See 'docker build --help'.
  make[1]: *** [docs-build] Error 125
  make: *** [docs] Error 2

after this change:

  /usr/bin/make -C docs docs
  docker build -t "docker-docs:docs-slashes" .
  Sending build context to Docker daemon 9.165 MB
  ...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-22 17:33:41 +02:00
Daniel Nephin 9e7651db4d Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-22 11:26:01 -04:00
Lei Jitang 3c4dab51d3 Remove DOCKER_EXECDRIVER env
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.

Signed-off-by: Lei Jitang <leijiang@huawei.com>
2015-11-09 09:17:32 +08:00
Mary Anthony f93fee5f48 retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
2015-06-15 13:19:38 -07:00
Sven Dowideit adf04681b4 remove rst/sphinx documentation
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-05-01 15:31:58 +10:00
Tianon Gravi 1cd9529ad3 Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page 2013-11-19 10:10:42 -07:00
Andy Rothfusz eeea9ac946 Add list of Docker Remote API Client Libraries. Fixes #800. 2013-06-10 15:17:27 -07:00
Thatcher Peskens 38f29f7d0c Changed some text on the website to include docker-club
Fixed a link in the FAQ on the docs
Fixed a detail in the Makefile for pushing the site to dotcloud
2013-06-03 11:45:19 -07:00
Daniel Gasienica b4df0b17af Add `make server` command to preview docs 2013-06-01 21:25:51 -07:00
Thatcher Peskens 537cce16f2 Added a "we are hiring" to the frontpage of the docker website, and fixed two broken links in the docs. 2013-05-17 19:35:46 -07:00
Thatcher Peskens 7557af19d8 Major rearrange of the documentation. 2013-05-10 12:00:12 -07:00
Thatcher Peskens 0f4469c2b1 Moved the static website html pages to their own folder under docs.
This should make previewing documentation easier.
Also updated the Makefile to now copy the theme dir into the _build/website/ dir. Make connect and Make push work.
2013-05-08 17:05:46 -07:00
Thatcher Peskens 6de5ca1e64 Added redirect from old location of documentation (/documentation), these was the location when we were on github. 2013-04-18 16:00:18 -07:00
Thatcher Peskens 90fb5dc962 Made all paths "pretty url's" including gettingstarted. 2013-03-27 17:01:50 -07:00
Thatcher Peskens 3b71336edc Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/ 2013-03-27 16:43:13 -07:00
Thatcher Peskens 8513c179f3 Added files REQUIRED to have succesfull gh-pages deploy (i.c.w. sphinx) 2013-03-26 17:25:26 -07:00
Solomon Hykes 7db1890c99 New 'make github-deploy' rule to deploy the docs to github-pages 2013-03-26 11:27:36 -07:00
Thatcher Peskens 69b09ccfc8 Merge of docker-website into the docker documentation. 2013-03-25 19:52:52 -07:00