Commit Graph

323 Commits

Author SHA1 Message Date
Kir Kolyshkin 4f86db67af Dockerfile: bump gh-pages to v177
This is needed for the following reasons:

1. gh-pages >= 174 is required to fix the issue #4178 [1]

2. Not using a tag leads to pulling some unknown version
of the image, which might or might not work.

3. Not using a tag means the image is never rebuilt.

NOTE: it was not possible to use a tag before, as recent gh-pages
releases were not tagged on dockerhub; this is now fixed
(see https://github.com/Starefossen/docker-github-pages/issues/36).

[1] https://github.com/docker/docker.github.io/issues/4178

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-03-13 10:40:42 -07:00
Kir Kolyshkin 20a34a2802 Dockerfile: fix apk command
1. It does not make sense to run apk many times.

2. Use --no-cache flag to avoid doing update, as per
   https://github.com/gliderlabs/docker-alpine/blob/master/docs/usage.md#disabling-cache

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-03-02 13:41:35 -08:00
John Mulhausen ee299f4d2e
Use latest GH Pages
We are compliant with it; we need to fork the source repo that generates this so we can iterate when we please, however.
2017-12-20 15:44:44 -08:00
johndmulhausen c65b094e24 Fix apk update bug 2017-10-02 17:32:33 -07:00
JimGalasyn ccb89d439c Add v17.06 2017-09-27 18:09:45 -07:00
John Mulhausen cb438751d6
Fix for docs-base 2017-06-30 16:07:03 -07:00
Misty Stanley-Jones 9a4cc320e4 Add v17.03 archive (#3763) 2017-06-30 10:57:26 -07:00
John Mulhausen 4209bee75a
Add svn and wget for downstream 2017-05-25 14:52:47 -07:00
John Mulhausen 93f688f8df
Update to GH Pages 137; alpine-based 2017-05-25 14:34:45 -07:00
Misty Stanley-Jones 82eee87efb Fix logic for fixing links in archives (#2503) 2017-03-27 15:51:41 -07:00
Misty Stanley-Jones a5a66777b9 Spaces FTW 2017-03-07 11:48:30 -08:00
Misty Stanley-Jones abd2137a8f Use shallow clone and shallow checkout 2017-03-07 11:01:36 -08:00
Misty Stanley-Jones 04e4f3280f Change keyserver for nginx 2017-03-06 11:25:03 -08:00
John Mulhausen d05b2ec214 Add v1.13 2017-03-02 13:49:35 -08:00
John Mulhausen 3165d5c019 Initial version of docs-base 2017-02-10 18:59:06 -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
Kenfe-Mickael Laventure 6c717a5744 Vendor in new containerd
This version introduces the following:
 - uses nanosecond timestamps for event
 - ensure events are sent once their effect is "live"

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 29b2714580d085533c29807fa337c2b7a302abb6)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:42 -07:00
Sebastiaan van Stijn 47a16dbe31 bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 589bafddf391cbf6aff8b22044266dc819cdcaeb)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:39 -07:00
Kenfe-Mickael Laventure 5199e3960e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 2685c82c2e1e75c1f7b39e8cb6e3d5acf258654d)
2016-07-01 12:01:28 -07:00