Commit Graph

54089 Commits

Author SHA1 Message Date
Sebastiaan van Stijn adfdc8e0a0
fetch-upstream-resources: fix check for svn vars
These checks were now checking the literal "engine_svn_branch" and
"distribution_svn_branch" string, instead of the value of the variables.

This was introduced in 1f7d4ce871 (whoops!)

We currently don't use this functionality, so not a critical bug.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:16:43 +01:00
Jérémie Drouet 41495fe4d1 ci: ensure project can be built for each PR
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-02-28 09:01:33 +01:00
Sebastiaan van Stijn 820a2242d1
Merge pull request #10363 from logankimmel/patch-3
fix update docker command
2020-02-27 23:28:46 +01:00
Usha Mandya 22da7572d7
Update tables from html to markdown format (#10360) 2020-02-27 10:34:24 +00:00
Usha Mandya a68383b33a
Merge pull request #10361 from mat007/windows-new-file-sharing
Remove obsolete file sharing information
2020-02-27 10:08:50 +00:00
Logan Kimmel 58aa5fb648
fix update docker command
If you supply the `--interactive` flag to `docker run` the prompt will never come back. That said, if somebody were to run this as a cron job, it would fail as the `ucp-phase2` container name will already exist.
2020-02-26 19:48:38 -07:00
Mathieu Champlon 8b58bcc00a Remove obsolete file sharing information 2020-02-26 12:11:50 +01:00
Usha Mandya adc18eed2f
Merge pull request #10341 from eug48/patch-1
update registry s3 storage driver docs to add skipverify flag
2020-02-26 11:06:47 +00:00
Usha Mandya 4112ce3b0a
Merge pull request #10353 from arueth/master
[ee/ucp/admin/install/plan-installation] Adding additional information to the 'Avoid IP range conflicts' section
2020-02-26 10:10:17 +00:00
Aaron Rueth 017b955cfd Adding additional information to the 'Avoid IP range conflicts' section 2020-02-25 13:47:53 -08:00
Usha Mandya f6b590cbb3
Merge pull request #10351 from thaJeztah/use_local_nginx_conf
Dockerfile: use local nginx configuration
2020-02-25 17:35:59 +00:00
Sebastiaan van Stijn 1763c42608
Dockerfile: use local nginx configuration
The docs/docker.github.io:nginx-onbuild has not been
updated for a while, and having a local file present
allows for easier updating it (for example, to add
wildcard redirects).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 18:33:10 +01:00
Maxim Orlov 4bb170e535
Remove incorrect difference between user-defined and default bridge (#10320)
* Remove incorrect difference between user-defined and default bridge

This PR removes the first bullet point from the list differences between user-defined bridge networks and the default bridge network:

[User-defined bridges provide better isolation and interoperability between containerized applications](https://docs.docker.com/network/bridge/#differences-between-user-defined-bridges-and-the-default-bridge).

The default bridge network, similar to user-defined bridges, opens all ports to other containers and allows for inter-container communication by default. This is elaborated and demonstrated in #8973. Other relevant issue: #8437.

* Remove mention of previous bullet point

* Added isolation advantage of user-defined over default network
2020-02-25 17:30:41 +00:00
Usha Mandya 42f005ea44
Merge pull request #10350 from thaJeztah/reduce_archives_list
Reduce list of archives to supported enterprise versions
2020-02-25 17:15:53 +00:00
Sebastiaan van Stijn c78b3bee78
Reduce list of archives to supported enterprise versions
Docker Enterprise actively supports the 17.06, 18.03, 18.09, and
19.03 versions, with 17.06 and 18.03 reaching EOL soon.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 17:15:22 +01:00
Sebastiaan van Stijn 12592a9442
sync _config_authoring.yaml with main _config
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 17:10:24 +01:00
Usha Mandya 0715c06677
Merge pull request #10344 from thaJeztah/unified_apis
Simplify fetching API versions
2020-02-25 14:22:07 +00:00
Sebastiaan van Stijn 3bbc3f5a25
Update directories to ignore/cleanup
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 14:01:01 +01:00
Sebastiaan van Stijn fbbc9498ae
fetch-upstream-resources: use cli repository instead of mono-repo
The docker/docker-ce repository components are only synchronized
periodically with the upstream docker/cli repository.

This patch switches the script to directly use the upstream cli
repository, instead of the docker-ce mono-repo.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 14:00:59 +01:00
Sebastiaan van Stijn 770cdeecb1
Engine API: use filename instead of custom api_version property
Now that the files are named `<api-version>.md`, we no longer need
to set a custom `api_version` property; instead we can use the filename
to detect what API version we're rendering.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 14:00:57 +01:00
Sebastiaan van Stijn 6dab89c905
Engine API: unify APIs: fetch from single branch
The upstream (moby/moby) repository is unifying all API swagger files
to be in the release branch. With that change, it is no longer needed
to fetch each version of the API separately, and instead all versions
can be fetched at once.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 14:00:55 +01:00
Usha Mandya 944eb75952
Merge pull request #10348 from thaJeztah/fix_engine_env_vars
Simplify use of "ENGINE_BRANCH" and "DISTRIBUTION_BRANCH"
2020-02-25 12:59:48 +00:00
Sebastiaan van Stijn b7cf4b0888
Merge pull request #10332 from usha-mandya/engine-api-patch
Fix Engine API toc
2020-02-25 13:43:10 +01:00
Sebastiaan van Stijn f2d5f959bc
Dockerfile: add note/todo about use of "toc" and "config"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 13:15:09 +01:00
Sebastiaan van Stijn 8271acddec
fetch-upstream-resources: cleanup .svn directories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 13:15:07 +01:00
Sebastiaan van Stijn 4434435ac7
fetch-upstream-resources: enforce _BRANCH vars to be set upfront
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 13:15:05 +01:00
Sebastiaan van Stijn 1f7d4ce871
Remove "svn" env-vars for branches
Don't require these to be set upfront, as we can create them
locally in the fetch-upstream-resources.sh script

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 13:15:03 +01:00
Sebastiaan van Stijn 1c82d140f7
Dockerfile: fix value for ENGINE_BRANCH
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-25 13:15:01 +01:00
Usha Mandya 787e383322
Merge pull request #10342 from thaJeztah/improve_compose
Improve building docs with compose
2020-02-25 12:10:35 +00:00
Usha Mandya adda3900e8
Merge pull request #10343 from thaJeztah/engine_api_layout
Engine API: use template for API reference pages
2020-02-25 12:01:59 +00:00
Sebastiaan van Stijn 16d565cae6
API remove section about enterprise API version mismatch
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:27 +01:00
Sebastiaan van Stijn 3a223f799c
SDK: fix some minor issues in go examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:25 +01:00
Sebastiaan van Stijn c7c1a59dab
API docs: recommend using version negotiation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:23 +01:00
Sebastiaan van Stijn 9774d43d65
SDK: remove reference to obsolete Go version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:21 +01:00
Sebastiaan van Stijn d021c47d26
Remove duplicated API reference from SDK docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:19 +01:00
Sebastiaan van Stijn c4309a1ef7
Remove duplicated SDK content from API overview
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:17 +01:00
Sebastiaan van Stijn ee407ac0ef
Move SDK examples under "sdk"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 17:15:06 +01:00
Sebastiaan van Stijn f757d8a14b
Engine API: use template for API reference pages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 13:58:30 +01:00
Sebastiaan van Stijn ebc86d840a
compose file: use v3 and no volume
The current target didn't have jekyll installed, so mounting the
source-files didn't do anything.

This patch removes the bind-mount.

Alternatively, we could switch back to using a jekyll stage (with
automatic rebuilding).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 13:56:22 +01:00
Sebastiaan van Stijn 24c0299e4e
compose file: disable archives by default
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 13:56:20 +01:00
Sebastiaan van Stijn 40b1b403e8
compose file: enable buildkit for building
This adds a `.env` file to enable buildkit when using
docker-compose to build the docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-24 13:56:16 +01:00
Usha Mandya f56f1476ac
Merge pull request #10331 from thaJeztah/archives_and_source_only
Dockerfile: allow building without archives, and exporting HTML source
2020-02-24 12:24:02 +00:00
Eugene Lubarsky 52840c7fe8
update registry s3 storage driver docs to add skipverify flag 2020-02-24 21:53:08 +11:00
LORIS INTERGALACTIQUE 711567c5af
Fixed typos on the rootless mode page (#10330)
* Fixed typos

* Minor wording update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-02-21 17:52:37 +00:00
Usha Mandya 1566e01673 Moved topics under engine/api/ 2020-02-21 16:44:41 +00:00
Usha Mandya 797daef4cc fix Engine API toc 2020-02-21 12:10:09 +00:00
Sebastiaan van Stijn c8b335c3b8
Dockerfile: add target to output the generated HTML
This patch adds a stage that only contains the generated files. It can
be used to export the generated HTML for hosting the documentation on a
non-containerised service (e.g. to deploy to an s3 bucket).

When using BuildKit, use the `--output` option to build the files and to
copy them to your local filesystem.

For example, to build current docs, including archives:

    DOCKER_BUILDKIT=1 docker build --target=deploy-source --output=./_site .

And to build without archives:

    DOCKER_BUILDKIT=1 docker build --target=deploy-source --build-arg ENABLE_ARCHIVES=false --output=./_site .

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-21 10:51:14 +01:00
Sebastiaan van Stijn 136a8d3f96
Dockerfile: allow building docs without archives
This adds a `ENABLE_ARCHIVES` build-arg, which allows building
the documentation without archives.

Note that currently, the archives drop-down is still added
unconditionally (so also included if archives are disabled).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-21 10:51:11 +01:00
Sebastiaan van Stijn a6a470e4e9
Dockerfile: use "from scratch" image to collect archives
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-21 10:51:09 +01:00
Usha Mandya a4ae7f1b7c
Updated Desktop URLs and removed CSP and EE URLs (#10322)
* Updated Desktop URLs and removed CSP and EE URLs

* Added Get started and removed Get docker URLs
2020-02-20 14:37:40 +00:00