diff --git a/_config.yml b/_config.yml index 5a5ed533d5..68b6caf0bb 100644 --- a/_config.yml +++ b/_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: diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml new file mode 100644 index 0000000000..a5d57a6554 --- /dev/null +++ b/_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 diff --git a/_includes/components/ddc_url_list_2.html b/_includes/components/ddc_url_list_2.html new file mode 100644 index 0000000000..cca8a02d7f --- /dev/null +++ b/_includes/components/ddc_url_list_2.html @@ -0,0 +1,18 @@ + +{% for data in site.data.ddc_offline_files_2 %} + {% if data.product == include.product and data.version == include.version %} +
+
+
+ {% for tar-file in data.tar-files %} + + {{ tar-file.description }} + + + {% endfor %} +
+
+
+ {% endif %} +{% endfor %} + diff --git a/datacenter/dtr/2.3/guides/admin/install/install-offline.md b/datacenter/dtr/2.3/guides/admin/install/install-offline.md index d84fe174fc..a6e973401d 100644 --- a/datacenter/dtr/2.3/guides/admin/install/install-offline.md +++ b/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 -Docker Datacenter components: +Use a computer with internet access to download a package with all DTR images: ```bash -$ wget -O docker-datacenter.tar.gz +$ wget -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 @:/tmp + $ scp dtr.tar.gz @ ``` 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 diff --git a/datacenter/ucp/2.2/guides/admin/install/install-offline.md b/datacenter/ucp/2.2/guides/admin/install/install-offline.md index 66c4956c6a..c917cae8ff 100644 --- a/datacenter/ucp/2.2/guides/admin/install/install-offline.md +++ b/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 -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 +You can also use these links to get the UCP package from the command line: ```bash $ wget -O ucp.tar.gz -$ wget -O dtr.tar.gz ``` -Now that you have the packages on your local machine, you can transfer them to -the machines where you want to install UCP and DTR. +Now that you have the package in your local machine, you can transfer it to +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 @:/tmp - $ scp dtr.tar.gz @:/tmp + $ scp ucp.tar.gz @ ``` 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. @@ -73,7 +65,7 @@ Follow the same steps for the DTR binaries. ## Install UCP Now that the offline hosts have all the images needed to install UCP, -you can [install Docker UCP on one of the manager nodes](index.md). +you can [install Docker UCP on one of the manager nodes](index.md). ## Where to go next diff --git a/datacenter/ucp/2.2/guides/admin/install/upgrade-offline.md b/datacenter/ucp/2.2/guides/admin/install/upgrade-offline.md index 238614685c..1299f3e57f 100644 --- a/datacenter/ucp/2.2/guides/admin/install/upgrade-offline.md +++ b/datacenter/ucp/2.2/guides/admin/install/upgrade-offline.md @@ -10,20 +10,22 @@ the internet or not. The only difference when installing on an offline host is that instead of pulling the UCP images from Docker Hub, you use a computer that's connected to the internet to download a single package with all the images. Then you -copy this package to the host where you upgrade UCP. +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 -UCP components: +You can also use these links to get the UCP package from the command +line: ```bash -$ wget -O ucp.tar.gz -$ wget -O dtr.tar.gz +$ wget -O ucp.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 @:/tmp - $ scp dtr.tar.gz @:/tmp + $ scp ucp.tar.gz @ ``` 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