diff --git a/_config.yml b/_config.yml index 1344ee1918..813426d325 100644 --- a/_config.yml +++ b/_config.yml @@ -62,6 +62,7 @@ tablabels: ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 dtr-2.5: Docker Trusted Registry 2.5 + dtr-2.4: Docker Trusted Registry 2.4 docker-cli-linux: Docker CLI on Mac/Linux docker-cli-win: Docker CLI on Windows kubectl: Kubernetes CLI diff --git a/_config_authoring.yml b/_config_authoring.yml index 32cc12f41e..4738a73654 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -48,7 +48,6 @@ dtr_versions: - version: "2.4" path: /datacenter/dtr/2.4/guides/ - version: "2.3" - latest: true path: /datacenter/dtr/2.3/guides/ - version: "2.2" path: /datacenter/dtr/2.2/guides/ @@ -62,6 +61,7 @@ tablabels: ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 dtr-2.5: Docker Trusted Registry 2.5 + dtr-2.4: Docker Trusted Registry 2.4 docker-cli-linux: Docker CLI on Mac/Linux docker-cli-win: Docker CLI on Windows kubectl: Kubernetes CLI diff --git a/datacenter/dtr/2.5/guides/admin/install/index.md b/datacenter/dtr/2.5/guides/admin/install/index.md index 8d90543565..ceca2480b5 100644 --- a/datacenter/dtr/2.5/guides/admin/install/index.md +++ b/datacenter/dtr/2.5/guides/admin/install/index.md @@ -2,7 +2,18 @@ title: Install Docker Trusted Registry description: Learn how to install Docker Trusted Registry for production. keywords: dtr, registry, install +ui_tabs: +- version: dtr-2.5 + orhigher: false +- version: dtr-2.4 + orlower: true +next_steps: +- path: install-offline/ + title: Install DTR offline +- path: ../upgrade/ + title: Upgrade DTR --- +{% if include.version=="dtr-2.5" %} Docker Trusted Registry (DTR) is a containerized application that runs on a swarm managed by Docker Universal Control Plane (UCP). It can be installed @@ -37,7 +48,7 @@ choose **Docker Trusted Registry**. After you configure all the options, you'll have a snippet that you can use to deploy DTR. It should look like this: -```none +```bash # Pull the latest version of DTR $ docker pull {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} @@ -115,7 +126,7 @@ To add replicas to a DTR cluster, use the `docker/dtr join` command: Then run: - ```none + ```bash docker run -it --rm \ {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} join \ --ucp-node \ @@ -130,7 +141,8 @@ To add replicas to a DTR cluster, use the `docker/dtr join` command: ![](../../images/install-dtr-6.png){: .with-border} -## See also +{% elsif include.version=="dtr-2.4" %} -* [Install DTR offline](install-offline.md) -* [Upgrade DTR](../upgrade.md) +Learn about [installing Docker Trusted Registry](/datacenter/dtr/2.4/guides/admin/install/index.md). + +{% endif %} \ No newline at end of file diff --git a/datacenter/dtr/2.5/guides/admin/install/install-offline.md b/datacenter/dtr/2.5/guides/admin/install/install-offline.md index 74250ed34f..3f156e401d 100644 --- a/datacenter/dtr/2.5/guides/admin/install/install-offline.md +++ b/datacenter/dtr/2.5/guides/admin/install/install-offline.md @@ -3,7 +3,18 @@ title: Install Docker Trusted Registry offline description: Learn how to install Docker Trusted Registry on a machine with no internet access. keywords: registry, install, offline +ui_tabs: +- version: dtr-2.5 + orhigher: false +- version: dtr-2.4 + orlower: true +next_steps: +- path: ../../architecture/ + title: DTR architecture +- path: ../install/ + title: Install DTR --- +{% if include.version=="dtr-2.5" %} The procedure to install Docker Trusted Registry on a host is the same, whether that host has access to the internet or not. @@ -64,7 +75,8 @@ DTR makes outgoing connections to: All of these uses of online connections are optional. You can choose to disable or not use any or all of these features on the admin settings page. -## Where to go next +{% elsif include.version=="dtr-2.4" %} -* [DTR architecture](../../architecture.md) -* [Install DTR](index.md) +Learn about [installing Docker Trusted Registry offline](/datacenter/dtr/2.4/guides/admin/install/install-offline.md). + +{% endif %} diff --git a/datacenter/dtr/2.5/guides/admin/install/system-requirements.md b/datacenter/dtr/2.5/guides/admin/install/system-requirements.md index 84be685766..420865738c 100644 --- a/datacenter/dtr/2.5/guides/admin/install/system-requirements.md +++ b/datacenter/dtr/2.5/guides/admin/install/system-requirements.md @@ -2,7 +2,16 @@ title: Docker Trusted Registry system requirements description: Learn about the system requirements for installing Docker Trusted Registry. keywords: DTR, architecture, requirements +ui_tabs: +- version: dtr-2.5 + orlower: true +next_steps: +- path: ../../architecture/ + title: DTR architecture +- path: ../install/ + title: Install DTR --- +{% if include.version=="dtr-2.5" %} Docker Trusted Registry can be installed on-premises or on the cloud. Before installing, be sure your infrastructure has these requirements. @@ -36,7 +45,4 @@ Docker Enterprise Edition is a software subscription that includes three product [Learn more about the maintenance lifecycle for these products](http://success.docker.com/Get_Help/Compatibility_Matrix_and_Maintenance_Lifecycle). -## Where to go next - -* [DTR architecture](../../architecture.md) -* [Install DTR](index.md) +{% endif %} \ No newline at end of file diff --git a/datacenter/dtr/2.5/guides/admin/install/uninstall.md b/datacenter/dtr/2.5/guides/admin/install/uninstall.md index ad40aecfb4..11f9b959fe 100644 --- a/datacenter/dtr/2.5/guides/admin/install/uninstall.md +++ b/datacenter/dtr/2.5/guides/admin/install/uninstall.md @@ -2,12 +2,23 @@ title: Uninstall Docker Trusted Registry description: Learn how to uninstall your Docker Trusted Registry installation. keywords: dtr, install, uninstall +ui_tabs: +- version: dtr-2.5 + orhigher: false +- version: dtr-2.4 + orlower: true +next_steps: +- path: ../configure/set-up-high-availability/ + title: Scale your deployment +- path: ../install/ + title: Install DTR --- +{% if include.version=="dtr-2.5" %} Uninstalling DTR can be done by simply removing all data associated with each replica. To do that, you just run the destroy command once per replica: -```none +```bash docker run -it --rm \ docker/dtr:{{ page.dtr_version }} destroy \ --ucp-insecure-tls @@ -19,7 +30,8 @@ destroy. To see what options are available in the destroy command, check the [destroy command reference documentation](/reference/dtr/2.5/cli/destroy.md). -## Where to go next +{% elsif include.version=="dtr-2.4" %} -* [Scale your deployment](../configure/set-up-high-availability.md) -* [Install DTR](index.md) +Learn about [uninstalling Docker Trusted Registry](/datacenter/dtr/2.4/guides/admin/install/uninstall.md). + +{% endif %} diff --git a/datacenter/dtr/2.5/guides/admin/upgrade.md b/datacenter/dtr/2.5/guides/admin/upgrade.md index 1158f90670..d2290ccb70 100644 --- a/datacenter/dtr/2.5/guides/admin/upgrade.md +++ b/datacenter/dtr/2.5/guides/admin/upgrade.md @@ -2,9 +2,18 @@ title: Upgrade DTR description: Learn how to upgrade your Docker Trusted Registry keywords: dtr, upgrade, install +ui_tabs: +- version: dtr-2.5 + orhigher: false +- version: dtr-2.4 + orlower: true +next_steps: +- path: ../release-notes/ + title: Release notes --- +{% if include.version=="dtr-2.5" %} -{% assign previous_version="2.3" %} +{% assign previous_version="2.4" %} DTR uses [semantic versioning](http://semver.org/) and we aim to achieve specific guarantees while upgrading between versions. We never support downgrading. We @@ -54,8 +63,8 @@ Make sure you're running DTR {{ previous_version }}. If that's not the case, Then pull the latest version of DTR: -```none -$ docker pull {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} +```bash +docker pull {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} ``` If the node you're upgrading doesn't have access to the internet, you can @@ -65,8 +74,8 @@ to get the images. Once you have the latest image on your machine (and the images on the target nodes if upgrading offline), run the upgrade command: -```none -$ docker run -it --rm \ +```bash +docker run -it --rm \ {{ page.dtr_org }}/{{ page.dtr_repo }}:{{ page.dtr_version }} upgrade \ --ucp-insecure-tls ``` @@ -85,6 +94,8 @@ command and it will resume from where it left off. A patch upgrade changes only the DTR containers and it's always safer than a minor upgrade. The command is the same as for a minor upgrade. -## Where to go next +{% elsif include.version=="dtr-2.4" %} -* [Release notes](../release-notes.md) +Learn about [upgrading Docker Trusted Registry](/datacenter/dtr/2.4/guides/admin/upgrade.md). + +{% endif %}