Commit Graph

326 Commits

Author SHA1 Message Date
Misty Stanley-Jones 103a3f8003 17.03 archive setup (#3753) 2017-06-29 16:55:18 -07:00
John Mulhausen 089f17eade
Add to shell call, Alpine necessity 2017-05-25 15:08:51 -07:00
John Mulhausen f95cccd24a
Update docs base description 2017-05-25 15:00:02 -07:00
Misty Stanley-Jones 9c648cf079 Docker 17.05 docs (#3092)
* Add Netlify build script

* Pull 'edge' stuff from master for now

* Add env-regex logging opt (#2688)

* Update Dockerfile to pull from 17.05 branch

* Update YAML files from 17.05.x branch

* Add scaffolding for 17.05 content

* Document highlights for 17.05

* Add v1.29 API

* Document multi-stage builds
2017-05-05 19:50:22 +00:00
Misty Stanley-Jones 10be60a80f Go back to small /edge (#2736)
* Go back to small /edge

* Update site front page

Add info about Editions
Reorganize components
Update headings

* Move logic of fetching content to a script

* Add v1.28 API

* Add info about versioned API
2017-04-13 18:58:56 -07:00
Misty Stanley-Jones 62d34e400b Update Dockerfile to build /edge 2017-04-05 17:45:44 -07:00
Misty Stanley-Jones e796ce8148 Site-specific changes for Edge 2017-04-05 17:45:44 -07:00
Misty Stanley-Jones dfc7f870c1 Use a different variable for svn than wget
The master branch is called trunk in svn parlance
and the directory structure is a little bit different.

Also trust the certificates for the https svn connections,
otherwise we may be prompted.

Fix Dockerfile in vnext-engine
2017-04-05 17:45:44 -07:00
Misty Stanley-Jones 184897095f Use a different variable for svn than wget
The master branch is called trunk in svn parlance
and the directory structure is a little bit different.

Also trust the certificates for the https svn connections,
otherwise we may be prompted.
2017-04-05 17:45:44 -07:00
Misty Stanley-Jones cb0c69c9d5 Fix Dockerfile in vnext-engine 2017-04-05 17:45:44 -07:00
Misty Stanley-Jones cff043f5a3 Use a different variable for svn than wget
The master branch is called trunk in svn parlance
and the directory structure is a little bit different.

Also trust the certificates for the https svn connections,
otherwise we may be prompted.
2017-04-05 17:45:44 -07:00
Misty Stanley-Jones 13004b9ed1 Take docker/docker references from master 2017-04-05 17:45:44 -07:00
Misty Stanley-Jones e6aa7e3f50 Update distribution version in Dockerfile (#2632) 2017-04-05 11:20:49 -07:00
Victor Vieux ad065409d9 bump api to 1.27 (#2461)
* bump api to 1.27

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-03-28 09:31:53 -07:00
Misty Stanley-Jones fc343a81fc Update to new Docker version scheme (#1926) 2017-03-01 14:52:34 -08:00
John Mulhausen a3dd8ff96e Switch to auto-building source of docs-base 2017-02-11 02:55:53 -08:00
John Mulhausen 69f622bb70 Move to GHP 112, nginx-based server, docs-base (#1515)
* Moves to GHP 112, nginx-based server

* Import official nginx instructions per @thaJeztah

* Reordering of commands per @thaJeztah

* Reordering of commands per @thaJeztah

* Make sure that at the end of each layer we only keep the one directory

* Forgot to use md_source when resolving conflicts

* Update Dockerfile

* Use base image, clean up cruft from docsarchive folder

* Update docs-base to be self-browseable, conf source of truth
2017-02-09 17:17:07 -08:00
Victor Vieux 80fa030ffd bump engine API to 1.26 (#1553)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-08 13:18:24 -08:00
John Mulhausen b547d91606
Publish v1.12 archive 2017-02-01 15:56:44 -08:00
Adrien Duermael edf388efc9 remove apidocs/layout after jekyll build
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-26 12:02:33 -08:00
Adrien Duermael 900cd57a1c make links to https://docs.docker.com relative
All of them, not just the ones in /engine/extend & /engine/reference

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-26 10:47:24 -08:00
Adrien Duermael 6129c4c255 remove apidocs/layouts after build (#1357)
* remove apidocs/layouts after build

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed keywords in swarm_manager_locking.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-24 14:26:04 -08:00
Misty Stanley-Jones 48c384cede Don't fetch the registry api template (#1341) 2017-01-23 15:01:27 -08:00
Adrien Duermael 366fb5b964 Link fixes (#1291)
* fixed links in toc.yaml

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* removed backslashed spaces in Dockerfile

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-20 14:00:33 -08:00
John Mulhausen ebe778b906 Update imports to work properly (#1221)
Update imports to work properly
2017-01-20 09:58:54 -08:00
John Mulhausen 35898701eb YAML-sourced CLI refdocs 2017-01-19 11:12:55 -08:00
Ben Firshman f8dac1b53c Add automatically generated Engine API docs
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-01-19 10:45:07 -08:00
Misty Stanley-Jones 4197fd8268 Update dockerfile vnext (#874)
* Merge pull request #731 from mstanleyjones/distribution_docs_from_upstream

Pull distribution reference docs from upstream repo

* Bump Engine ref docs branch to 1.13.x

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-01-19 10:43:39 -08:00
Adrien Duermael 41cdf339f6 CI - added tests for relative links [DO NOT MERGE] (#1052)
* CI - added tests for relative links

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixes to check relative links properly

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* /engine/extend/plugins/ -> /engine/extend/legacy_plugins/

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* do not build /tests folder with Jekyll…

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* list all problematic urls in each file

don’t stop at first error encountered

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* removed “stack tasks” from menu (toc.yaml)

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken links

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken link in docker-for-mac/osxfs.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken links in /index.html

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-17 13:11:15 -08:00
Adrien Duermael 1ef7132a6f exclude /apidocs/cloud-api-source when building
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-01-11 14:46:06 -08:00
Adrien Duermael 609c66710b Fixed absolute links in external content (#886)
The files we’re pulling from docker/docker may include links to docs.docker.com. And we can’t forbid that because relative links wouldn’t make sense in the context of docker/docker repository in some situations. So let’s just fix these links right after get imported.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-15 17:58:30 -08:00
Adrien Duermael 5b8abceb56 don’t copy files to /_site (#871)
files in /usr/src/app/allvbuild and /_site are the same. Let’s just serve what’s in /usr/src/app/allvbuild.

Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-12-13 15:28:42 -08:00
Misty Stanley-Jones f2857417d1 Merge remote-tracking branch 'upstream/master' into distribution_docs_from_upstream 2016-11-30 10:23:11 -08:00
Misty Stanley-Jones 554b2c9967 Pull distribution reference docs from upstream 2016-11-28 13:51:52 -08:00
Sebastiaan van Stijn 721f9d2aba
Optimize Dockerfile
This optimizes the Dockerfile a bit by;

- putting the docs archives at the top to
  optimize caching and to prevent having
  to clone the github repository on each
  build. Note that '--no-cache' is needed
  to forcefully break the cache, but the
  archives should not frequently change
- grouping RUN lines to reduce image size.
- using a loop for the archived versions to
  reduce the amount of duplicated code.
- using the local files for the *current*
  version of the docs instead of the git
  clone from GitHub. this makes it also
  use the right source instead of "master"
- adding a .dockerignore to prevent busting
  the cache if not needed, and to prevent
  uploading the '.git' repository, which
  is not used for the "current" docs

Difference in size before/after;

    REPOSITORY     TAG     IMAGE ID      CREATED         SIZE
    docs           latest  36f6ad029e6a  3 minutes ago   1.722 GB
    docs-orig      latest  4f1a3e3fda4f  16 minutes ago  3.344 GB

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-22 00:20:02 +01:00
John Mulhausen 57fcd95be9 Reverting reversion, geez 2016-11-18 19:08:42 -08:00
John Mulhausen 69f07bcd1e Revert "Merge pull request #654 from mstanleyjones/fix_dockerfile"
This reverts commit 2ede6ff7f0, reversing
changes made to 30772c6703.
2016-11-18 19:04:42 -08:00
Misty Stanley-Jones fbab0cf7b9 Fixing the Dockerfile 2016-11-18 16:40:06 -08:00
Misty Stanley-Jones 2a82508963 Change Dockerfile to fetch engine refs from docker/docker 1.12.x branch
Update Dockerfile and NOT_EDITED_HERE manifest

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-16 15:50:24 -08:00
John Mulhausen 9e96e483bc Create subdirectory-based docs archive 2016-10-26 17:48:00 -07:00
John Mulhausen b62fd51a29 Update Dockerfile 2016-10-05 15:31:14 -07:00
John Mulhausen 8f61311862 Dockerfile fix for autobuild 2016-10-04 00:26:09 -07:00
John Mulhausen d12eeca057 baseurl fix 2016-10-03 19:44:51 -07:00
John Mulhausen e71693c545 baseurl fix 2016-10-03 19:44:11 -07:00
John Mulhausen bc04375f4e Create Dockerfile 2016-10-03 17:27:35 -07:00
John Mulhausen 99bab305bd Removing merge detritus 2016-09-29 23:38:12 -07:00
Misty Stanley-Jones d53c6798c9 Convert TOML to YAML, tweaks to work with Jekyll 2016-09-29 17:16:03 -07:00
Misty Stanley-Jones 9d5e59d503 Moved engine imported docs to the engine subdirectory 2016-09-29 11:19:31 -07:00
Kenfe-Mickael Laventure 727402135d Vendor in containerd
This brings in the exec's children handling fixes

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-25 05:23:22 -07:00
Justin Cormack ef634b95f4 Patch Go with fix for OSX Sierra
Backport this patch to the Go 1.6.3 runtime needed for OSX Sierra.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 23:30:25 +01:00