diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000000..e69de29bb2 diff --git a/404.html b/404.html new file mode 100644 index 0000000000..410cdd8549 --- /dev/null +++ b/404.html @@ -0,0 +1,15 @@ + + +
+ + +We have moved away from the docker.github.io domain. If you're not automatically redirected, please visit us at docs.docker.com.
+ + + + \ No newline at end of file diff --git a/404.md b/404.md index 8d9cf07ed6..8aa08de7c5 100644 --- a/404.md +++ b/404.md @@ -6,11 +6,5 @@ notoc: true tree: false --- -It seems the page you're looking for doesn't exist. Maybe you're on the wrong -track, maybe you found a broken link. Who knows? - -Either way, here's a couple of options for you: - -* [Open an issue](https://github.com/docker/docker.github.io/issues/new?title=I%20found%20a%20broken%20link&body=%3CDescribe%20how%20you%20got%20there%3E) -* [Go to back](/) -* [Tweet us something](https://twitter.com/docker) + +Please file an issue at [https://github.com/docker/docker.github.io](https://github.com/docker/docker.github.io/issues/new). diff --git a/Jenkinsfile b/Jenkinsfile index 310ed40948..34916fbce7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,25 +1,92 @@ -wrappedNode(label: 'ubuntu-1604 && x86_64') { - timeout(time: 60, unit: 'MINUTES') { - deleteDir() - stage "checkout" - checkout scm - sh "git submodule update --init --recursive" - stage "test" +def dtrVpnAddress = "vpn.corp-us-east-1.aws.dckr.io" +def ucpBundle = [file(credentialsId: "ucp-bundle", variable: 'UCP')] +def slackString = [string(credentialsId: 'slack-docs-webhook', variable: 'slack')] +def reg = [credentialsId: 'csebuildbot', url: 'https://index.docker.io/v1/'] - /* Jekyll creates html files to implement client side redirects. - There are absolute links to docs.docker.com in these htmls - we don't want them to be parsed by the tests for now. - Removing jekyll-redirect-from option will make sure these pages - are not generated when building with Jekyll. */ - sh "awk '/jekyll-redirect-from/{n=1}; n {n--; next}; 1' < _config.yml > _config.yml.tmp" - sh "mv _config.yml.tmp _config.yml" - - sh "docker build -t docs:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`" - sh "docker build -t tests:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`/tests" - sh "docker run -v /usr/src/app/allvbuild --name docs-${JOB_BASE_NAME}-${BUILD_NUMBER} docs:${JOB_BASE_NAME}-${BUILD_NUMBER} /bin/true" - sh "docker run --rm --volumes-from docs-${JOB_BASE_NAME}-${BUILD_NUMBER} -v `pwd`:/docs tests:${JOB_BASE_NAME}-${BUILD_NUMBER}" - sh "docker rm -fv docs-${JOB_BASE_NAME}-${BUILD_NUMBER}" - sh "docker rmi docs:${JOB_BASE_NAME}-${BUILD_NUMBER} tests:${JOB_BASE_NAME}-${BUILD_NUMBER}" - deleteDir() +pipeline { + agent none + options { + timeout(time: 1, unit: 'HOURS') + } + stages { + stage( 'docker.github.io' ) { + agent { + label 'ubuntu-1604-aufs-stable' + } + stages { + stage( 'build and push stage image' ) { + when { + branch 'master' + } + steps { + withDockerRegistry(reg) { + sh """ + docker image build --tag docs/docker.github.io:stage-${env.BUILD_NUMBER} . && \ + docker image push docs/docker.github.io:stage-${env.BUILD_NUMBER} + """ + } + } + } + stage( 'build and push prod image' ) { + when { + branch 'published' + } + steps { + withDockerRegistry(reg) { + sh """ + docker image build --tag docs/docker.github.io:prod-${env.BUILD_NUMBER} . && \ + docker image push docs/docker.github.io:prod-${env.BUILD_NUMBER} + """ + } + } + } + stage( 'update docs-stage' ) { + when { + branch 'master' + } + steps { + withVpn(dtrVpnAddress) { + withCredentials(ucpBundle) { + sh 'unzip -o $UCP' + } + withDockerRegistry(reg) { + sh """ + export DOCKER_TLS_VERIFY=1 + export COMPOSE_TLS_VERSION=TLSv1_2 + export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot + export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443 + docker service update --detach=false --force --image docs/docker.github.io:stage-${env.BUILD_NUMBER} docs-stage-docker-com_docs --with-registry-auth + """ + } + } + } + } + stage( 'update docs-prod' ) { + when { + branch 'published' + } + steps { + withVpn(dtrVpnAddress) { + withCredentials(ucpBundle) { + sh 'unzip -o $UCP' + } + withCredentials(slackString) { + withDockerRegistry(reg) { + sh """ + cd ucp-bundle-success_bot + export DOCKER_TLS_VERIFY=1 + export COMPOSE_TLS_VERSION=TLSv1_2 + export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot + export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443 + docker service update --detach=false --force --image docs/docker.github.io:prod-${env.BUILD_NUMBER} docs-docker-com_docs --with-registry-auth + curl -X POST -H 'Content-type: application/json' --data '{"text":"Successfully published docs. https://docs.docker.com/"}' $slack + """ + } + } + } + } + } + } + } } } diff --git a/_config.yml b/_config.yml index 5cd0eb10b6..463ec13ade 100644 --- a/_config.yml +++ b/_config.yml @@ -14,14 +14,13 @@ lsi: false url: https://docs.docker.com # This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile) keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12", "v18.03"] -exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"] +exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"] -# Component versions -- address like site.docker_ce_stable_version +# Component versions -- address like site.docker_ce_version # You can't have - characters in these for non-YAML reasons -latest_stable_docker_engine_api_version: "1.39" -docker_ce_stable_version: "18.09" -docker_ce_edge_version: "18.09" +latest_engine_api_version: "1.39" +docker_ce_version: "18.09" docker_ee_version: "18.09" compose_version: "1.23.2" machine_version: "0.16.0" @@ -95,7 +94,7 @@ defaults: - scope: path: "install" values: - win_latest_build: "docker-18.09.0" + win_latest_build: "docker-18.09.1" - scope: path: "datacenter" values: @@ -105,34 +104,34 @@ defaults: values: dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.6.0" + dtr_version: "2.6.2" - scope: path: "datacenter/dtr/2.5" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.5.6" + dtr_version: "2.5.8" - scope: path: "datacenter/dtr/2.4" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.4.7" + dtr_version: "2.4.9" - scope: path: "datacenter/dtr/2.3" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.3.9" + dtr_version: "2.3.10" - scope: path: "datacenter/dtr/2.2" values: ucp_version: "2.1" dtr_version: "2.2" - docker_image: "docker/dtr:2.2.12" + docker_image: "docker/dtr:2.2.11" - scope: path: "datacenter/dtr/2.1" values: @@ -148,30 +147,29 @@ defaults: values: ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.1.1" + ucp_version: "3.1.2" - scope: # This is a bit of a hack for the get-support.md topic. path: "ee" values: ucp_org: "docker" ucp_repo: "ucp" dtr_repo: "dtr" - ucp_version: "3.1.1" - dtr_version: "2.6.0" - dtr_latest_image: "docker/dtr:2.6.0" + ucp_version: "3.1.3" + dtr_version: "2.6.2" - scope: path: "datacenter/ucp/3.0" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.0.7" + ucp_version: "3.0.9" - scope: path: "datacenter/ucp/2.2" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "2.2.14" + ucp_version: "2.2.16" - scope: path: "datacenter/ucp/2.1" values: diff --git a/_config_authoring.yml b/_config_authoring.yml index 921585729a..f95761ac42 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -2,36 +2,38 @@ name: Docker Documentation markdown: kramdown kramdown: input: GFM + gfm_quirks: [paragraph_end, no_auto_typographic] html_to_native: true hard_wrap: false syntax_highlighter: rouge toc_levels: 2..3 +incremental: false permalink: pretty safe: false lsi: false url: https://docs.docker.com -incremental: false -# Component versions -- address like site.docker_ce_stable_version +# Component versions -- address like site.docker_ce_version # You can't have - characters in these for non-YAML reasons # TO USE ME: # jekyll serve --incremental --config _config_authoring.yml -docker_ce_stable_version: "17.09" -latest_stable_docker_engine_api_version: "1.32" -docker_ce_edge_version: "17.09" -docker_ee_version: "17.06" -compose_version: "1.16.1" -machine_version: "0.12.2" +latest_engine_api_version: "1.39" +docker_ce_version: "18.09" +docker_ee_version: "18.09" +compose_version: "1.23.2" +machine_version: "0.16.0" distribution_version: "2.6" -dtr_version: "2.5" -ucp_version: "3.0" +dtr_version: "2.6" +ucp_version: "3.1" ucp_versions: - - version: "3.0" + - version: "3.1" path: /ee/ucp/ latest: true + - version: "3.0" + path: /datacenter/ucp/3.0/guides/ - version: "2.2" path: /datacenter/ucp/2.2/guides/ - version: "2.1" @@ -42,9 +44,11 @@ ucp_versions: path: /datacenter/ucp/1.1/overview/ dtr_versions: - - version: "2.5" + - version: "2.6" path: /ee/dtr/ latest: true + - version: "2.5" + path: /datacenter/dtr/2.5/guides/ - version: "2.4" path: /datacenter/dtr/2.4/guides/ - version: "2.3" @@ -57,7 +61,7 @@ dtr_versions: path: /datacenter/dtr/2.0/ tablabels: - dee-2.0: Docker Enterprise Edition 2.0 Beta2 + dee-2.0: Docker Enterprise Edition 2.0 ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 dtr-2.5: Docker Trusted Registry 2.5 @@ -69,52 +73,65 @@ tablabels: kubectl: Kubernetes CLI cli: CLI +collections: + samples: + output: true + +plugins: + - jekyll-redirect-from + - jekyll-relative-links + - jekyll-sitemap + defaults: - - - scope: + - scope: path: "" type: "pages" values: layout: docs - defaultassignee: johndmulhausen toc_min: 2 toc_max: 3 tree: true - scope: - path: "engine" + path: "install" values: - win_latest_build: "docker-17.06.2-ee-6" + win_latest_build: "docker-18.09.1" - scope: path: "datacenter" values: - ucp_latest_image: "docker/ucp:3.0.0-beta2" - dtr_latest_image: "docker/dtr:2.5.0-beta3" enterprise: true - scope: path: "ee/dtr" values: dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.5.0-beta3" + dtr_version: "2.6.1" + - scope: + path: "datacenter/dtr/2.5" + values: + hide_from_sitemap: true + dtr_org: "docker" + dtr_repo: "dtr" + dtr_version: "2.5.7" - scope: path: "datacenter/dtr/2.4" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.4.1" + dtr_version: "2.4.8" - scope: path: "datacenter/dtr/2.3" values: + hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.3.4" + dtr_version: "2.3.10" - scope: path: "datacenter/dtr/2.2" values: ucp_version: "2.1" dtr_version: "2.2" - docker_image: "docker/dtr:2.2.9" + docker_image: "docker/dtr:2.2.11" - scope: path: "datacenter/dtr/2.1" values: @@ -130,29 +147,47 @@ defaults: values: ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.0.0-beta2" + ucp_version: "3.1.2" + - scope: # This is a bit of a hack for the get-support.md topic. + path: "ee" + values: + ucp_org: "docker" + ucp_repo: "ucp" + dtr_repo: "dtr" + ucp_version: "3.1.2" + dtr_version: "2.6.1" + - scope: + path: "datacenter/ucp/3.0" + values: + hide_from_sitemap: true + ucp_org: "docker" + ucp_repo: "ucp" + ucp_version: "3.0.8" - scope: path: "datacenter/ucp/2.2" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "2.2.3" + ucp_version: "2.2.15" - scope: path: "datacenter/ucp/2.1" values: + hide_from_sitemap: true ucp_version: "2.1" dtr_version: "2.2" - docker_image: "docker/ucp:2.1.5" + docker_image: "docker/ucp:2.1.8" - scope: path: "datacenter/ucp/2.0" values: + hide_from_sitemap: true ucp_version: "2.0" dtr_version: "2.1" - docker_image: "docker/ucp:2.0.3" + docker_image: "docker/ucp:2.0.4" - scope: path: "datacenter/ucp/1.1" values: + hide_from_sitemap: true ucp_version: "1.1" dtr_version: "2.0" diff --git a/_data/advisories.yaml b/_data/advisories.yaml index f69a8b7ca1..cc8e6b0a03 100644 --- a/_data/advisories.yaml +++ b/_data/advisories.yaml @@ -10,13 +10,13 @@ texts: experimental: "The functionality described on this page is marked as Experimental, and as such, may change before it becomes generally available." rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available." - docker4mac-beta: "Docker for Mac is currently in public beta. Some functionality may change before the product becomes generally available." - docker4win-beta: "Docker for Windows is currently in public beta. Some functionality may change before the product becomes generally available." - toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible." - kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications." + docker4mac-beta: "Docker Desktop for Mac is currently in public beta. Some functionality may change before the product becomes generally available." + docker4win-beta: "Docker Desktop for Windows is currently in public beta. Some functionality may change before the product becomes generally available." + toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker Desktop for Mac](/docker-for-mac/) and [Docker Desktop for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible." + kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker Desktop for Mac](/docker-for-mac/) or [Docker Desktop for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications." swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the [Get started with Docker walkthrough](/get-started/)). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." - engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta." + engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker Desktop for Mac and Docker Desktop for Windows are currently in Beta." # URL based advisories diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index dc493531a0..54c417c600 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -5,7 +5,27 @@ # Used by _includes/components/ddc_url_list_2.html - product: "ucp" version: "3.1" - tar-files: + tar-files: + - description: "3.1.3 Windows Server 2019" + url: https://packages.docker.com/caas/ucp_images_win_2019_3.1.3.tar.gz + - description: "3.1.3 Windows Server 1809" + url: https://packages.docker.com/caas/ucp_images_win_1809_3.1.3.tar.gz + - description: "3.1.3 Linux" + url: https://packages.docker.com/caas/ucp_images_3.1.3.tar.gz + - description: "3.1.3 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.1.3.tar.gz + - description: "3.1.3 Windows Server 1709" + url: https://packages.docker.com/caas/ucp_images_win_1709_3.1.3.tar.gz + - description: "3.1.3 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.1.3.tar.gz + - description: "3.1.2 Linux" + url: https://packages.docker.com/caas/ucp_images_3.1.2.tar.gz + - description: "3.1.2 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.1.2.tar.gz + - description: "3.1.2 Windows Server 1709" + url: https://packages.docker.com/caas/ucp_images_win_1709_3.1.2.tar.gz + - description: "3.1.2 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.1.2.tar.gz - description: "3.1.1 Linux" url: https://packages.docker.com/caas/ucp_images_3.1.1.tar.gz - description: "3.1.1 Windows Server 2016 LTSC" @@ -25,6 +45,24 @@ - product: "ucp" version: "3.0" tar-files: + - description: "3.0.9 Linux" + url: https://packages.docker.com/caas/ucp_images_3.0.9.tar.gz + - description: "3.0.9 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_3.0.9.tar.gz + - description: "3.0.9 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.9.tar.gz + - description: "3.0.9 Windows Server 1709" + url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.9.tar.gz + - description: "3.0.9 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.9.tar.gz + - description: "3.0.8 Linux" + url: https://packages.docker.com/caas/ucp_images_3.0.8.tar.gz + - description: "3.0.8 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.8.tar.gz + - description: "3.0.8 Windows Server 1709" + url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.8.tar.gz + - description: "3.0.8 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.8.tar.gz - description: "3.0.7 Linux" url: https://packages.docker.com/caas/ucp_images_3.0.7.tar.gz - description: "3.0.7 Windows Server 2016 LTSC" @@ -90,6 +128,18 @@ - product: "ucp" version: "2.2" tar-files: + - description: "2.2.16 Linux" + url: https://packages.docker.com/caas/ucp_images_2.2.16.tar.gz + - description: "2.2.16 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_2.2.16.tar.gz + - description: "2.2.16 Windows" + url: https://packages.docker.com/caas/ucp_images_win_2.2.16.tar.gz + - description: "2.2.15 Linux" + url: https://packages.docker.com/caas/ucp_images_2.2.15.tar.gz + - description: "2.2.15 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_2.2.15.tar.gz + - description: "2.2.15 Windows" + url: https://packages.docker.com/caas/ucp_images_win_2.2.15.tar.gz - description: "2.2.14 Linux" url: https://packages.docker.com/caas/ucp_images_2.2.14.tar.gz - description: "2.2.14 IBM Z" @@ -171,11 +221,19 @@ - product: "dtr" version: "2.6" tar-files: + - description: "DTR 2.6.2 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.6.2.tar.gz + - description: "DTR 2.6.1 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.6.1.tar.gz - description: "DTR 2.6.0 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.6.0.tar.gz - product: "dtr" version: "2.5" tar-files: + - description: "DTR 2.5.8 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.5.8.tar.gz + - description: "DTR 2.5.7 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.5.7.tar.gz - description: "DTR 2.5.6 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.6.tar.gz - description: "DTR 2.5.5 Linux x86" @@ -191,6 +249,10 @@ - product: "dtr" version: "2.4" tar-files: + - description: "DTR 2.4.9 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.4.9.tar.gz + - description: "DTR 2.4.8 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.4.8.tar.gz - description: "DTR 2.4.7 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz - description: "DTR 2.4.6 Linux x86" @@ -224,6 +286,8 @@ - product: "dtr" version: "2.3" tar-files: + - description: "DTR 2.3.10" + url: https://packages.docker.com/caas/dtr_images_2.3.10.tar.gz - description: "DTR 2.3.9" url: https://packages.docker.com/caas/dtr_images_2.3.9.tar.gz - description: "DTR 2.3.8" diff --git a/_data/engine-cli-edge/docker.yaml b/_data/engine-cli-edge/docker.yaml deleted file mode 100644 index cfed41624a..0000000000 --- a/_data/engine-cli-edge/docker.yaml +++ /dev/null @@ -1,121 +0,0 @@ -command: docker -cname: -- docker attach -- docker build -- docker checkpoint -- docker commit -- docker config -- docker container -- docker cp -- docker create -- docker deploy -- docker diff -- docker events -- docker exec -- docker export -- docker history -- docker image -- docker images -- docker import -- docker info -- docker inspect -- docker kill -- docker load -- docker login -- docker logout -- docker logs -- docker manifest -- docker network -- docker node -- docker pause -- docker plugin -- docker port -- docker ps -- docker pull -- docker push -- docker rename -- docker restart -- docker rm -- docker rmi -- docker run -- docker save -- docker search -- docker secret -- docker service -- docker stack -- docker start -- docker stats -- docker stop -- docker swarm -- docker system -- docker tag -- docker top -- docker trust -- docker unpause -- docker update -- docker version -- docker volume -- docker wait -clink: -- docker_attach.yaml -- docker_build.yaml -- docker_checkpoint.yaml -- docker_commit.yaml -- docker_config.yaml -- docker_container.yaml -- docker_cp.yaml -- docker_create.yaml -- docker_deploy.yaml -- docker_diff.yaml -- docker_events.yaml -- docker_exec.yaml -- docker_export.yaml -- docker_history.yaml -- docker_image.yaml -- docker_images.yaml -- docker_import.yaml -- docker_info.yaml -- docker_inspect.yaml -- docker_kill.yaml -- docker_load.yaml -- docker_login.yaml -- docker_logout.yaml -- docker_logs.yaml -- docker_manifest.yaml -- docker_network.yaml -- docker_node.yaml -- docker_pause.yaml -- docker_plugin.yaml -- docker_port.yaml -- docker_ps.yaml -- docker_pull.yaml -- docker_push.yaml -- docker_rename.yaml -- docker_restart.yaml -- docker_rm.yaml -- docker_rmi.yaml -- docker_run.yaml -- docker_save.yaml -- docker_search.yaml -- docker_secret.yaml -- docker_service.yaml -- docker_stack.yaml -- docker_start.yaml -- docker_stats.yaml -- docker_stop.yaml -- docker_swarm.yaml -- docker_system.yaml -- docker_tag.yaml -- docker_top.yaml -- docker_trust.yaml -- docker_unpause.yaml -- docker_update.yaml -- docker_version.yaml -- docker_volume.yaml -- docker_wait.yaml -deprecated: false -experimental: false -experimentalcli: false -kubernetes: false -swarm: false - diff --git a/_data/engine-cli-edge/docker_attach.yaml b/_data/engine-cli-edge/docker_attach.yaml deleted file mode 100644 index 9497cb5cb4..0000000000 --- a/_data/engine-cli-edge/docker_attach.yaml +++ /dev/null @@ -1,166 +0,0 @@ -command: docker attach -short: Attach local standard input, output, and error streams to a running container -long: |- - Use `docker attach` to attach your terminal's standard input, output, and error - (or any combination of the three) to a running container using the container's - ID or name. This allows you to view its ongoing output or to control it - interactively, as though the commands were running directly in your terminal. - - > **Note:** - > The `attach` command will display the output of the `ENTRYPOINT/CMD` process. This - > can appear as if the attach command is hung when in fact the process may simply - > not be interacting with the terminal at that time. - - You can attach to the same contained process multiple times simultaneously, - from different sessions on the Docker host. - - To stop a container, use `CTRL-c`. This key sequence sends `SIGKILL` to the - container. If `--sig-proxy` is true (the default),`CTRL-c` sends a `SIGINT` to - the container. You can detach from a container and leave it running using the - `CTRL-p CTRL-q` key sequence. - - > **Note:** - > A process running as PID 1 inside a container is treated specially by - > Linux: it ignores any signal with the default action. So, the process - > will not terminate on `SIGINT` or `SIGTERM` unless it is coded to do - > so. - - It is forbidden to redirect the standard input of a `docker attach` command - while attaching to a tty-enabled container (i.e.: launched with `-t`). - - While a client is connected to container's stdio using `docker attach`, Docker - uses a ~1MB memory buffer to maximize the throughput of the application. If - this buffer is filled, the speed of the API connection will start to have an - effect on the process output writing speed. This is similar to other - applications like SSH. Because of this, it is not recommended to run - performance critical applications that generate a lot of output in the - foreground over a slow client connection. Instead, users should use the - `docker logs` command to get access to the logs. - - ### Override the detach sequence - - If you want, you can configure an override the Docker key sequence for detach. - This is useful if the Docker default sequence conflicts with key sequence you - use for other applications. There are two ways to define your own detach key - sequence, as a per-container override or as a configuration property on your - entire configuration. - - To override the sequence for an individual container, use the - `--detach-keys="Option | \nRequired | \nDescription | \n - \
---|---|---|
types | \n\n | \n The - type of mount, can be either volume, bind, or tmpfs. - Defaults to volume if no type is specified.\n
| \n
src or source | \nfor type=bind only> | \n - \\n
| \n
dst or destination or target | \n
- \ yes | \n\n Mount path inside the container, for example - /some/path/in/container/.\n If the path does not exist in the container's - filesystem, the Engine creates\n a directory at the specified location before - mounting the volume or bind mount. \n | \n
readonly - or ro | \n \n | \n The Engine mounts binds - and volumes read-write unless readonly option\n is given - when mounting the bind or volume.\n
| \n
- \
consistency | \n\n | \n The - consistency requirements for the mount; one of\n
| \n
- \
Option | \nDescription | \n - \
---|---|
volume-driver | \n\n Name of the - volume-driver plugin to use for the volume. Defaults to\n \"local\", - to use the local volume driver to create the volume if the\n volume does not - exist. \n | \n
volume-label | \n\n - \ One or more custom metadata (\"labels\") to apply to the volume upon\n creation. - For example,\n volume-label=mylabel=hello-world,my-other-label=hello-mars. - For more\n information about labels, refer to\n apply - custom metadata.\n | \n
volume-nocopy | \n - \\n By default, if you attach an empty volume to a container, and files
- or\n directories already existed at the mount-path in the container (dst),\n
- \ the Engine copies those files and directories into the volume, allowing\n
- \ the host to access them. Set volume-nocopy to disable copying files\n
- \ from the container's filesystem to the volume and mount the empty volume. \n\n A value is optional:\n\n
| \n
volume-opt | \n\n Options specific to a given volume - driver, which will be passed to the\n driver when creating the volume. Options - are provided as a comma-separated\n list of key/value pairs, for example,\n - \ volume-opt=some-option=some-value,volume-opt=some-other-option=some-other-value.\n - \ For available options for a given driver, refer to that driver's\n documentation.\n - \ | \n
Option | \n - \Description | \n
---|---|
tmpfs-size | \nSize - of the tmpfs mount in bytes. Unlimited by default in Linux. | \n
tmpfs-mode | \nFile mode of the tmpfs in octal. (e.g. \"700\" - or \"0700\".) Defaults to \"1777\" in Linux. | \n
node attribute | \n - \matches | \nexample | \n
---|---|---|
node.id | \n - \Node ID | \nnode.id==2ivku8v2gvtg4 | \n
node.hostname | \nNode hostname | \nnode.hostname!=node-2 | \n - \
node.role | \nNode role | \nnode.role==manager | \n - \
node.labels | \nuser defined node labels | \n - \node.labels.security==high | \n
engine.labels | \n - \Docker Engine's labels | \nengine.labels.operatingsystem==ubuntu - 14.04 | \n
Option | \nShort syntax | \n - \Long syntax | \nDescription | \n
---|---|---|---|
published - and target port | \n--publish 8080:80 | \n--publish - published=8080,target=80 | \n\n The target port within the container - and the port to map it to on the\n nodes, using the routing mesh (ingress) - or host-level networking.\n More options are available, later in this table. - The key-value syntax is\n preferred, because it is somewhat self-documenting.\n - \ | \n
mode | \nNot possible to set using short - syntax. | \n--publish published=8080,target=80,mode=host | \n - \\n The mode to use for binding the port, either ingress or - host.\n Defaults to ingress to use the routing mesh.\n | \n
protocol | \n--publish 8080:80/tcp | \n--publish - published=8080,target=80,protocol=tcp | \n\n The protocol to - use, tcp , udp, or sctp. Defaults to\n tcp. - To bind a port for both protocols, specify the -p or\n --publish - flag twice.\n | \n
Placeholder | \nDescription | \n
---|---|
.Service.ID | \n - \Service ID | \n
.Service.Name | \n - \Service name | \n
.Service.Labels | \n - \Service labels | \n
.Node.ID | \nNode - ID | \n
.Node.Hostname | \nNode Hostname | \n - \
.Task.ID | \nTask ID | \n
.Task.Name | \nTask name | \n
.Task.Slot | \nTask slot | \n