Merge pull request #9098 from ollypom/privateintopublic

Merge remote-tracking branch 'private/master' into public
docker · Jul 22, 2019 · aa4c53c · aa4c53c
2 parents 736d2c7 + c87ce56
commit aa4c53c
Show file tree

Hide file tree

Showing 532 changed files with 51,597 additions and 1,991 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,6 @@ pipeline {
     label 'ubuntu-1604-aufs-stable'
   }
   environment {
-    DTR_VPN_ADDRESS       = credentials('dtr-vpn-address')
     DTR_URL               = credentials('dtr-url')
     DOCKER_HOST_STRING    = credentials('docker-host')
     UCP_BUNDLE            = credentials('ucp-bundle')
@@ -26,41 +25,37 @@ pipeline {
             branch 'master'
           }
           steps {
-            withVpn("$DTR_VPN_ADDRESS") {
-              sh """
-                cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
-                docker build -t $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} .
-                docker push $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER}
-                unzip -o $UCP_BUNDLE
-                export DOCKER_TLS_VERIFY=1
-                export COMPOSE_TLS_VERSION=TLSv1_2
-                export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
-                export DOCKER_HOST=$DOCKER_HOST_STRING
-                docker service update --detach=false --force --image $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} docs-stage-docker-com_docs --with-registry-auth
-              """
-            }
+            sh """
+              cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
+              docker build -t $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} .
+              docker push $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER}
+              unzip -o $UCP_BUNDLE
+              export DOCKER_TLS_VERIFY=1
+              export COMPOSE_TLS_VERSION=TLSv1_2
+              export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
+              export DOCKER_HOST=$DOCKER_HOST_STRING
+              docker service update --detach=false --force --image $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} docs-stage-docker-com_docs --with-registry-auth
+            """
           }
         }
         stage( 'build + push prod image, update prod swarm' ) {
           when {
             branch 'published'
           }
           steps {
-            withVpn("$DTR_VPN_ADDRESS") {
-              withDockerRegistry(reg) {
-                sh """
-                  docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} .
-                  docker push docs/docker.github.io:prod-${env.BUILD_NUMBER}
-                  unzip -o $UCP_BUNDLE
-                  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=$DOCKER_HOST_STRING
-                  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
-                """
-              }
+            withDockerRegistry(reg) {
+              sh """
+                docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} .
+                docker push docs/docker.github.io:prod-${env.BUILD_NUMBER}
+                unzip -o $UCP_BUNDLE
+                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=$DOCKER_HOST_STRING
+                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
+              """
             }
           }
         }
@@ -76,39 +71,35 @@ pipeline {
             branch 'amberjack'
           }
           steps {
-            withVpn("$DTR_VPN_ADDRESS") {
-              sh """
-                cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
-                docker build -t $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} .
-                docker push $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER}
-                unzip -o $UCP_BUNDLE
-                export DOCKER_TLS_VERIFY=1
-                export COMPOSE_TLS_VERSION=TLSv1_2
-                export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
-                export DOCKER_HOST=$DOCKER_HOST_STRING
-                docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} docs-beta-stage-docker-com_docs --with-registry-auth
-              """
-            }
+            sh """
+              cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
+              docker build -t $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} .
+              docker push $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER}
+              unzip -o $UCP_BUNDLE
+              export DOCKER_TLS_VERIFY=1
+              export COMPOSE_TLS_VERSION=TLSv1_2
+              export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
+              export DOCKER_HOST=$DOCKER_HOST_STRING
+              docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} docs-beta-stage-docker-com_docs --with-registry-auth
+            """
           }
         }
         stage( 'build + push beta image, update beta swarm' ) {
           when {
             branch 'published'
           }
           steps {
-            withVpn("$DTR_VPN_ADDRESS") {
-              sh """
-                cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
-                docker build -t $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} .
-                docker push $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER}
-                unzip -o $UCP_BUNDLE
-                export DOCKER_TLS_VERIFY=1
-                export COMPOSE_TLS_VERSION=TLSv1_2
-                export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
-                export DOCKER_HOST=$DOCKER_HOST_STRING
-                docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
-              """
-            }
+            sh """
+              cat $SUCCESS_BOT_TOKEN | docker login  $DTR_URL --username 'success_bot' --password-stdin
+              docker build -t $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} .
+              docker push $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER}
+              unzip -o $UCP_BUNDLE
+              export DOCKER_TLS_VERIFY=1
+              export COMPOSE_TLS_VERSION=TLSv1_2
+              export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
+              export DOCKER_HOST=$DOCKER_HOST_STRING
+              docker service update --detach=false --force --image $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
+            """
           }
         }
       }

diff --git a/README.md b/README.md
@@ -363,7 +363,7 @@ branch](https://github.com/docker/docker.github.io/blob/publish-tools/README.md)
 
 ## Creating a new archive
 
-When a new Docker CE Stable version is released, the previous state of `master`
+When a new Docker Engine - Community Stable version is released, the previous state of `master`
 is archived into a version-specific branch like `v17.09`, by doing the following:
 
 1.  Create branch based off the commit hash before the new version was released.

diff --git a/_config.yml b/_config.yml
@@ -82,6 +82,7 @@ tablabels:
   engine-18.09: Docker EE Engine 18.09
   engine-18.03: Docker EE Engine 18.03
   engine-17.12: Docker EE Engine 17.12
+  engine-17.09: Docker EE Engine 17.09
   engine-17.06: Docker EE Engine 17.06
   engine-17.03: Docker EE Engine 17.03
   docker-cli-linux: Docker CLI on Mac/Linux
@@ -170,7 +171,7 @@ defaults:
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "3.1.9"
+      ucp_version: "3.2.0"
   - scope: # This is a bit of a hack for the get-support.md topic.
       path: "ee"
     values:

diff --git a/_config_authoring.yml b/_config_authoring.yml
@@ -19,9 +19,9 @@ url: https://docs.docker.com
 # TO USE ME:
 # jekyll serve --incremental --config _config_authoring.yml
 
-latest_engine_api_version: "1.39"
-docker_ce_version: "18.09"
-docker_ee_version: "18.09"
+latest_engine_api_version: "1.40"
+docker_ce_version: "19.03"
+docker_ee_version: "19.03"
 compose_version: "1.24.1"
 compose_file_v3: "3.7"
 compose_file_v2: "2.4"
@@ -96,7 +96,7 @@ defaults:
   - scope:
       path: "install"
     values:
-      win_latest_build: "docker-18.09.1"
+      win_latest_build: "docker-19.03.0"
   - scope:
       path: "datacenter"
     values:

diff --git a/_data/application-template/docker_template.yaml b/_data/application-template/docker_template.yaml
@@ -0,0 +1,23 @@
+command: docker template
+short: Use templates to quickly create new services
+long: Use templates to quickly create new services
+pname: docker
+plink: docker.yaml
+cname:
+- docker template config
+- docker template inspect
+- docker template list
+- docker template scaffold
+- docker template version
+clink:
+- docker_template_config.yaml
+- docker_template_inspect.yaml
+- docker_template_list.yaml
+- docker_template_scaffold.yaml
+- docker_template_version.yaml
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+
diff --git a/_data/application-template/docker_template_config.yaml b/_data/application-template/docker_template_config.yaml
@@ -0,0 +1,17 @@
+command: docker template config
+short: Modify docker template configuration
+long: Modify docker template configuration
+pname: docker template
+plink: docker_template.yaml
+cname:
+- docker template config set
+- docker template config view
+clink:
+- docker_template_config_set.yaml
+- docker_template_config_view.yaml
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+
diff --git a/_data/application-template/docker_template_config_set.yaml b/_data/application-template/docker_template_config_set.yaml
@@ -0,0 +1,48 @@
+command: docker template config set
+short: set default values for docker template
+long: set default values for docker template
+usage: docker template config set
+pname: docker template config
+plink: docker_template_config.yaml
+options:
+- option: feedback
+  value_type: bool
+  default_value: "false"
+  description: |
+    Send anonymous feedback about usage (performance, failure status, os, version)
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+- option: no-feedback
+  value_type: bool
+  default_value: "false"
+  description: Don't send anonymous feedback
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+- option: org
+  value_type: string
+  description: Set default organization / docker hub user
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+- option: server
+  value_type: string
+  description: Set default registry server (host[:port])
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+
diff --git a/_data/application-template/docker_template_config_view.yaml b/_data/application-template/docker_template_config_view.yaml
@@ -0,0 +1,22 @@
+command: docker template config view
+short: view default values for docker template
+long: view default values for docker template
+usage: docker template config view
+pname: docker template config
+plink: docker_template_config.yaml
+options:
+- option: format
+  value_type: string
+  default_value: yaml
+  description: Configure the output format (json|yaml)
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+
diff --git a/_data/application-template/docker_template_inspect.yaml b/_data/application-template/docker_template_inspect.yaml
@@ -0,0 +1,22 @@
+command: docker template inspect
+short: Inspect service templates or application templates
+long: Inspect service templates or application templates
+usage: docker template inspect <service or application>
+pname: docker template
+plink: docker_template.yaml
+options:
+- option: format
+  value_type: string
+  default_value: pretty
+  description: Configure the output format (pretty|json|yaml)
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+
diff --git a/_data/application-template/docker_template_list.yaml b/_data/application-template/docker_template_list.yaml
@@ -0,0 +1,32 @@
+command: docker template list
+aliases: ls
+short: List available templates with their informations
+long: List available templates with their informations
+usage: docker template list
+pname: docker template
+plink: docker_template.yaml
+options:
+- option: format
+  value_type: string
+  default_value: pretty
+  description: Configure the output format (pretty|json|yaml)
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+- option: type
+  value_type: string
+  default_value: all
+  description: Filter by type (application|service|all)
+  deprecated: false
+  experimental: false
+  experimentalcli: false
+  kubernetes: false
+  swarm: false
+deprecated: false
+experimental: false
+experimentalcli: true
+kubernetes: false
+swarm: false
+