Update UCP/DTR offline instructions

_config.yml

@@ -105,7 +105,8 @@ defaults:
     values:
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.3.0"
+      dtr_version_minor: "2.3"
+      dtr_version: "2.3.0-beta1"
   - scope:
       path: "datacenter/dtr/2.2"
     values:
@@ -130,7 +131,8 @@ defaults:
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "2.2.0"
+      ucp_version_minor: "2.2"
+      ucp_version: "2.2.0-beta1"
   - scope:
       path: "datacenter/ucp/2.1"
     values:

_data/ddc_offline_files_2.yaml

@@ -0,0 +1,19 @@
+# This contains the list of urls that you can use to download a tar file
+# with all the images needed to install Docker Datacenter in an air-gapped
+# environment that can't access the internet
+
+# Used by _includes/components/ddc_url_list.html
+- product: "ucp"
+  version: "2.2"
+  tar-files:
+    - description: "2.2.0-beta 1 Linux"
+      url: https://packages.docker.com/caas/ucp_images_2.2.0-beta1.tar.gz
+    - description: "2.2.0-beta 1 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_2.2.0-beta1.tar.gz
+    - description: "2.2.0-beta 1 Windows"
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.0-beta1.tar.gz
+- product: "dtr"
+  version: "2.3"
+  tar-files:
+    - description: "DTR 2.3.0"
+      url: https://packages.docker.com/caas/dtr-2.3.0-beta1.tar.gz

_includes/components/ddc_url_list_2.html

@@ -0,0 +1,18 @@
+<!-- Start of ddc_url_list.html, displays a list of DDC tar files -->
+{% for data in site.data.ddc_offline_files_2 %}
+  {% if data.product == include.product and data.version == include.version %}
+  <div class="row">
+    <div class="col-md-6 col-md-offset-3">
+      <div class="list-group center-block">
+        {% for tar-file in data.tar-files %}
+          <a href="{{ tar-file.url }}" target="_blank" class="list-group-item">
+            {{ tar-file.description }}
+            <span class="badge"><span class="glyphicon glyphicon-chevron-right"></span></span>
+          </a>
+        {% endfor %}
+      </div>
+    </div>
+  </div>
+  {% endif %}
+{% endfor %}
+<!-- End of dc_url_list.html -->

datacenter/dtr/2.3/guides/admin/install/install-offline.md

@@ -15,15 +15,14 @@ all the images. Then you copy that package to the host where you’ll install DT
 
 ## Versions available
 
-{% include components/ddc_url_list.html %}
+{% include components/ddc_url_list_2.html product="dtr" version="2.3" %}
 
 ## Download the offline package
 
-Use a computer with internet access to download a single package with all
+Use a computer with internet access to download a package with all DTR images:
-Docker Datacenter components:
 
 ```bash
-$ wget <package-url> -O docker-datacenter.tar.gz
+$ wget <package-url> -O dtr.tar.gz
 ```
 
 Now that you have the package in your local machine, you can transfer it to
@@ -31,21 +30,21 @@ the machines where you want to install DTR.
 
 For each machine where you want to install DTR:
 
-1.  Copy the Docker Datacenter package to that machine.
+1.  Copy the DTR package to that machine.
 
     ```bash
-    $ scp docker-datacenter.tar.gz <user>@<host>:/tmp
+    $ scp dtr.tar.gz <user>@<host>
     ```
 
 2.  Use ssh to login into the hosts where you transferred the package.
 
-3.  Load the Docker Datacenter images.
+3.  Load the DTR images.
 
     Once the package is transferred to the hosts, you can use the
     `docker load` command, to load the Docker images from the tar archive:
 
     ```bash
-    $ docker load < docker-datacenter.tar.gz
+    $ docker load < dtr.tar.gz
     ```
 
 ## Install DTR

datacenter/ucp/2.2/guides/admin/install/install-offline.md

@@ -24,48 +24,40 @@ installation will fail.
 
 ## Versions available
 
-{% include components/ddc_url_list.html %}
+Use a computer with internet access to download the UCP package from the
+following links.
+
+{% include components/ddc_url_list_2.html product="ucp" version="2.2" %}
 
 ## Download the offline package
 
-Use a computer with internet access to download the packages with all
+You can also use these links to get the UCP package from the command
-Docker Enterprise Edition components. Get the latest binary packages 
-for UCP and DTR from the following links. 
-
-### Versions available
-
-{% include components/ddc_url_list.html %}
-
-You can also use these links to get the UCP and DTR binaries from the command 
 line:
 
 ```bash
 $ wget <ucp-package-url> -O ucp.tar.gz
-$ wget <dtr-package-url> -O dtr.tar.gz
 ```
 
-Now that you have the packages on your local machine, you can transfer them to
+Now that you have the package in your local machine, you can transfer it to
-the machines where you want to install UCP and DTR.
+the machines where you want to install UCP.
 
 For each machine that you want to manage with UCP:
 
-1.  Copy the Docker EE package to the machine.
+1.  Copy the UCP package to the machine.
 
     ```bash
-    $ scp ucp.tar.gz <user>@<host>:/tmp
+    $ scp ucp.tar.gz <user>@<host>
-    $ scp dtr.tar.gz <user>@<host>:/tmp
     ```
 
 2.  Use ssh to log in to the hosts where you transferred the package.
 
-3.  Load the Docker EE images.
+3.  Load the UCP images.
 
     Once the package is transferred to the hosts, you can use the
     `docker load` command, to load the Docker images from the tar archive:
 
     ```bash
     $ docker load < ucp.tar.gz
-    $ docker load < dtr.tar.gz
     ```
 
 Follow the same steps for the DTR binaries.

datacenter/ucp/2.2/guides/admin/install/upgrade-offline.md

@@ -14,16 +14,18 @@ copy this package to the host where you upgrade UCP.
 
 ## Versions available
 
-{% include components/ddc_url_list.html %}
+Use a computer with internet access to download the UCP package from the
+following links.
+
+{% include components/ddc_url_list_2.html product="ucp" version="2.2" %}
 
 ## Download the offline package
 
-Use a computer with internet access to download a single package with all
+You can also use these links to get the UCP package from the command
-UCP components:
+line:
 
 ```bash
-$ wget <package-url> -O ucp.tar.gz
+$ wget <ucp-package-url> -O ucp.tar.gz
-$ wget <package-url> -O dtr.tar.gz
 ```
 
 Now that you have the package in your local machine, you can transfer it to
@@ -34,20 +36,18 @@ For each machine that you want to manage with UCP:
 1.  Copy the offline package to the machine.
 
     ```bash
-    $ scp ucp.tar.gz <user>@<host>:/tmp
+    $ scp ucp.tar.gz <user>@<host>
-    $ scp dtr.tar.gz <user>@<host>:/tmp
     ```
 
 2.  Use ssh to log in to the hosts where you transferred the package.
 
-3.  Load the UCP and DTR images.
+3.  Load the UCP images.
 
     Once the package is transferred to the hosts, you can use the
     `docker load` command, to load the Docker images from the tar archive:
 
     ```bash
     $ docker load < ucp.tar.gz
-    $ docker load < dtr.tar.gz
     ```
 
 ## Upgrade UCP