From 1a60bdffc5a8e0f3b158d1d78d64130550fc75c4 Mon Sep 17 00:00:00 2001 From: lena-larionova <54370747+lena-larionova@users.noreply.github.com> Date: Wed, 2 Oct 2019 11:22:38 -0700 Subject: [PATCH 1/7] Deleting an account or org (#1346) * Deleting an account or org, new topic to replace a support article Signed-off-by: Lena Larionova * Removed steps for deleting repos Fixed everything from comments * renamed topic from delete to deactivate Signed-off-by: Lena Larionova --- _data/toc.yaml | 2 ++ docker-hub/deactivate-account.md | 50 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 docker-hub/deactivate-account.md diff --git a/_data/toc.yaml b/_data/toc.yaml index 3b29e9e293..3a701bd757 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -4041,6 +4041,8 @@ manuals: title: Trust Chain - path: /docker-hub/publish/byol/ title: Bring Your Own License (BYOL) + - path: /docker-hub/deactivate-account/ + title: Deactivate an account or an organization - sectiontitle: Open-source projects section: - sectiontitle: Docker Notary diff --git a/docker-hub/deactivate-account.md b/docker-hub/deactivate-account.md new file mode 100644 index 0000000000..57a513856e --- /dev/null +++ b/docker-hub/deactivate-account.md @@ -0,0 +1,50 @@ +--- +title: Deactivating an account or an organization +description: Learn how to deactivate a Docker Hub account or an organization +keywords: Docker Hub, delete, deactivate, account, organization +--- + +Your Docker Hub account or organization may also be linked to other Docker products and services, so deactivating it will also disable access to those products and services. + +## Deactivating an account + +Before deactivating your Docker Hub account, please complete the following: + +1. Download any images and tags you want to keep: + `docker pull -a :`. + +3. If you have an active subscription, downgrade it to the **free** plan. + + In Docker Hub, navigate to **_Your Account_** > **Account Settings** > **Billing**. + +4. If you have an enterprise license, download the key. + + In Docker Hub, navigate to **_Your Account_** > **Accounts Settings** > **Licenses**. The download link will no longer be available after your account is disabled. + +5. If you belong to any organizations, remove your account from all of them. + +6. If you are the sole owner of any organization, either add someone to the **owners** team and then remove yourself from the organization, or deactivate the organization as well. + +7. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account). + +Once you have completed all the steps above, you may deactivate your account. On Docker Hub, go to **_Your Account_** > **Accounts Settings** > **Deactivate Account**. + +> This cannot be undone! Be sure you've gathered all the data you need from your account before deactivating it. + + +## Deactivating an organization + +Before deactivating an organization, please complete the following: + +1. Download any images and tags you want to keep: + `docker pull -a :`. + +2. If you have an active subscription, downgrade it to the **free** plan: + + In Docker Hub, navigate to **Organizations** > **_Your Organization_** > **Billing**. + +3. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account). + +Once you have completed all the steps above, you may deactivate your organization. On Docker Hub, go to **Organizations** > **_Your Organization_** > **Settings** > **Deactivate Org**. + +> This cannot be undone! Be sure you've gathered all the data you need from your organization before deactivating it. From e1c93b05798935da7a8dc4085d846be2facd0bb4 Mon Sep 17 00:00:00 2001 From: Traci Morrison <52976526+traci-morrison@users.noreply.github.com> Date: Tue, 15 Oct 2019 11:51:24 -0400 Subject: [PATCH 2/7] Add back up and restore links --- _data/toc.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_data/toc.yaml b/_data/toc.yaml index 7654c98d0c..81ba82fb7a 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1410,6 +1410,10 @@ manuals: title: Troubleshoot with logs - path: /ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations/ title: Troubleshoot configurations + - title: Back up UCP + path: /ee/admin/backup/back-up-ucp/ + - title: Restore UCP + path: /ee/admin/restore/restore-ucp/ - title: CLI reference path: /reference/ucp/3.2/cli/ nosync: true From 6953c1ea563d8813965b66cc513a634354d8ff6f Mon Sep 17 00:00:00 2001 From: Traci Morrison <52976526+traci-morrison@users.noreply.github.com> Date: Wed, 16 Oct 2019 09:03:56 -0400 Subject: [PATCH 3/7] Revert "Add link to Azure roles document" --- cluster/azure.md | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/cluster/azure.md b/cluster/azure.md index 64fc0e87c9..fa50d9c74f 100644 --- a/cluster/azure.md +++ b/cluster/azure.md @@ -12,7 +12,6 @@ title: Get started with Docker Cluster on Azure - Service Principal App Secret - Subscription UUID - Tenant UUID -- Organizations wishing to provision roles with explicit permissions should refer to [Azure Roles](https://github.com/docker/cluster/blob/master/docs/azure_role.md) to determine the necessary permissions. More information can be found on obtaining these with either the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest) or through the [Azure Portal](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal). @@ -37,12 +36,12 @@ $ export CLUSTER_SECRETS_FILE=~/.my-secrets/my-azure-creds.sh $ docker cluster create .... ``` -Docker Cluster will bindmount this file into its container runtime to inject the +Docker cluster will bindmount this file into its container runtime to inject the credential data as needed. ## Create a cluster -When you create a Docker Cluster in Azure, the cluster created has: +When you create a docker cluster in Azure, the cluster created has: - 3 UCP Managers - 3 Workers - 3 DTR Replicas @@ -95,7 +94,7 @@ The values will be substituted in the cluster definition. This makes it easy to define a reusable cluster definition and then change the variables to create multiple instances of a cluster. -Run `docker cluster create --file cluster.yml --name quickstart`. +Run `docker cluster create --file cluster.yml --name quickstart` $ docker cluster create --file cluster.yml --name quickstart Please provide a value for ucp_password: @@ -135,21 +134,21 @@ After about 15-20 minutes, Docker Enterprise installation will complete: e58dd2a77567 -After all operations complete successfully, the cluster id will be the last statement -to print. You can log in to the URL and begin interacting with the cluster. +After all operations complete succesfully, the cluster id will be the last statement +to print. You can login to the URL and begin interacting with the cluster. ## View cluster information -To see an inventory of the current clusters you've created, run `docker cluster ls`. +To see an inventory of the current clusters you've created, run `docker cluster ls` $ docker cluster ls ID NAME PROVIDER ENDPOINT STATE e58dd2a77567 quickstart azurerm https://ucp-e58dd2a77567-y4pl.centralus.cloudapp.azure.com running -To see detailed information about an individual cluster, run `docker cluster inspect quickstart`. +To see detailed information about an individual cluster, run `docker cluster inspect quickstart` -```yaml $ docker cluster inspect quickstart +```yaml name: quickstart shortid: e58dd2a77567 variable: @@ -217,13 +216,13 @@ The information displayed by `docker cluster inspect` can be used as a cluster d ## Use context -Docker Cluster creates a context on your local machine. To use this context, and interact with the cluster, run `docker context use quickstart`. +Docker cluster creates a context on your local machine. To use this context, and interact with the cluster, run `docker context use quickstart` $ docker context use quickstart quickstart Current context is now "quickstart" -To verify that the client is connected to the cluster, run `docker version`. +To verify that the client is connected to the cluster, run `docker version` ```bash $ docker version @@ -301,7 +300,7 @@ resource: ``` Since the cluster is already created, the next step is to `update` the cluster's -desired state. Run `docker cluster update quickstart --file cluster.yml`. +desired state. Run `docker cluster update quickstart --file cluster.yml` $ docker cluster update quickstart --file cluster.yml Docker Enterprise Platform 3.0 @@ -309,7 +308,7 @@ desired state. Run `docker cluster update quickstart --file cluster.yml`. Planning cluster on azure [OK] Updating: [================== ] 30% -After about 10 minutes, the update operation adds the new nodes and joins them to the cluster: +After about 10 minutes the update operation adds the new nodes and joins them to the cluster: $ docker cluster update quickstart --file examples/docs.yml Please provide a value for ucp_password @@ -324,7 +323,7 @@ After about 10 minutes, the update operation adds the new nodes and joins them t e58dd2a77567 -Run `docker cluster inspect e58dd2a77567` to view increased worker count. +A quick `docker cluster inspect e58dd2a77567` will show the worker count increased: ```yaml ... @@ -339,7 +338,7 @@ Run `docker cluster inspect e58dd2a77567` to view increased worker count. ## Backup a cluster -Before we proceed with more operations on the cluster, let's take a backup of the running cluster. To create a full backup of the cluster, run `docker cluster backup quickstart --file "backup-$(date '+%Y-%m-%d').tar.gz" `. +Before we proceed with more operations on the cluster, let's take a backup of the running cluster. To create a full backup of the cluster, run `docker cluster backup quickstart --file "backup-$(date '+%Y-%m-%d').tar.gz" ` Provide a passphrase to encrypt the UCP backup. @@ -352,7 +351,7 @@ Provide a passphrase to encrypt the UCP backup. Save the backups on external storage for disaster recovery. -To restore a cluster, run `docker cluster restore quickstart --file backup-2019-05-07.tar.gz`. +To restore a cluster, run `docker cluster restore quickstart --file backup-2019-05-07.tar.gz` Provide the passphrase from the backup step to decrypt the UCP backup. @@ -370,7 +369,7 @@ cluster: version: docker/ucp:3.2.0 ``` -Run `docker cluster update quickstart --file cluster.yml `. +Run `docker cluster update quickstart --file cluster.yml ` $ docker cluster update quickstart --file examples/docs.yml Please provide a value for ucp_password @@ -387,7 +386,7 @@ Run `docker cluster update quickstart --file cluster.yml `. ## Destroy a cluster -When the cluster has reached end-of-life, run `docker cluster rm quickstart`. +When the cluster has reached end-of-life, run `docker cluster rm quickstart` $ docker cluster rm quickstart Removing quickstart From 09c8a2d726ab2b60d9b0b34a3c9af96e7154c9f2 Mon Sep 17 00:00:00 2001 From: Renan Roggia Date: Wed, 16 Oct 2019 15:27:18 -0300 Subject: [PATCH 4/7] Update references to the get-started pages (#9651) --- develop/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/develop/index.md b/develop/index.md index 142b1fb173..6146985ace 100644 --- a/develop/index.md +++ b/develop/index.md @@ -15,8 +15,8 @@ most benefits from Docker. - Learn to [build an image from a Dockerfile](/get-started/part2.md){: target="_blank" class="_"} - Use [multistage builds](/engine/userguide/eng-image/multistage-build.md){: target="_blank" class="_"} to keep your images lean - Manage application data using [volumes](/engine/admin/volumes/volumes.md) and [bind mounts](/engine/admin/volumes/bind-mounts.md){: target="_blank" class="_"} -- [Scale your app](/get-started/part3.md){: target="_blank" class="_"} as a swarm service -- [Define your app stack](/get-started/part5.md){: target="_blank" class="_"} using a compose file +- [Scale your app](/get-started/part3.md){: target="_blank" class="_"} with kubernetes +- [Scale your app](/get-started/part4.md){: target="_blank" class="_"} as a swarm service - General application development best practices ## Learn about language-specific app development with Docker From ee246b49cb3b7416c0ecf84b82cf4095cf0d1709 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Wed, 16 Oct 2019 16:28:22 -0400 Subject: [PATCH 5/7] Glossary: 1 letter grammar-fix (#9643) --- _data/glossary.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/glossary.yaml b/_data/glossary.yaml index a3cbd6619f..15ac8fbd72 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -351,7 +351,7 @@ volume: | A volume is a specially-designated directory within one or more containers that bypasses the Union File System. Volumes are designed to persist data, independent of the container's life cycle. Docker therefore never automatically - delete volumes when you remove a container, nor will it "garbage collect" + deletes volumes when you remove a container, nor will it "garbage collect" volumes that are no longer referenced by a container. *Also known as: data volume* From 4f3d71aa7d5410e7f786c99e8ea007269f4b5a7a Mon Sep 17 00:00:00 2001 From: lena-larionova <54370747+lena-larionova@users.noreply.github.com> Date: Wed, 16 Oct 2019 14:54:48 -0700 Subject: [PATCH 6/7] Fixing broken DTR upgrade links (#9658) * Fixed links to previous versions Signed-off-by: Lena Larionova * Fixed another link Signed-off-by: Lena Larionova --- datacenter/dtr/2.4/guides/admin/upgrade.md | 2 +- datacenter/dtr/2.5/guides/admin/upgrade.md | 2 +- datacenter/dtr/2.6/guides/admin/upgrade.md | 12 ++++++------ ee/dtr/admin/upgrade.md | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/datacenter/dtr/2.4/guides/admin/upgrade.md b/datacenter/dtr/2.4/guides/admin/upgrade.md index c12a1588f4..6409e772fa 100644 --- a/datacenter/dtr/2.4/guides/admin/upgrade.md +++ b/datacenter/dtr/2.4/guides/admin/upgrade.md @@ -87,4 +87,4 @@ upgrade. The command is the same as for a minor upgrade. ## Where to go next -* [Release notes](../release-notes.md) +* [Release notes](../release-notes/#version-24.md) diff --git a/datacenter/dtr/2.5/guides/admin/upgrade.md b/datacenter/dtr/2.5/guides/admin/upgrade.md index 824e09b687..c37f320acc 100644 --- a/datacenter/dtr/2.5/guides/admin/upgrade.md +++ b/datacenter/dtr/2.5/guides/admin/upgrade.md @@ -96,4 +96,4 @@ After upgrading DTR, you need to re-download the vulnerability database. ## Where to go next -* [Release notes](../release-notes.md) +* [Release notes](../release-notes/#version-25.md) diff --git a/datacenter/dtr/2.6/guides/admin/upgrade.md b/datacenter/dtr/2.6/guides/admin/upgrade.md index f053ff15d9..8fe0d689af 100644 --- a/datacenter/dtr/2.6/guides/admin/upgrade.md +++ b/datacenter/dtr/2.6/guides/admin/upgrade.md @@ -40,7 +40,7 @@ to avoid any business impacts. > Upgrade Best Practices > -> There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before `18.09` to version `18.09` or greater. See [Cluster Upgrade Best Practices](/ee/upgrade.md#cluster-upgrade-best-practices) for more details. Additionally, to ensure high availability during the DTR upgrade, you can also drain the DTR replicas and move their workloads to updated workers. To do this, you can join new workers as DTR replicas to your existing cluster and then remove the old replicas. See [docker/dtr join](/reference/dtr/2.6/cli/join) and [docker/dtr remove](/reference/dtr/2.6/cli/remove) for command options and details. +> There are [important changes to the upgrade process](/ee/upgrade) that, if not correctly followed, can have impact on the availability of applications running on the Swarm during upgrades. These constraints impact any upgrades coming from any version before `18.09` to version `18.09` or greater. See [Cluster Upgrade Best Practices](/ee/upgrade.md#cluster-upgrade-best-practices) for more details. Additionally, to ensure high availability during the DTR upgrade, you can also drain the DTR replicas and move their workloads to updated workers. To do this, you can join new workers as DTR replicas to your existing cluster and then remove the old replicas. See [docker/dtr join](/v18.09/reference/dtr/2.6/cli/join) and [docker/dtr remove](/v18.09/reference/dtr/2.6/cli/remove) for command options and details. ## Minor upgrade @@ -54,7 +54,7 @@ are trying to upgrade to. [Check the compatibility matrix](https://success.docke ### Step 1. Upgrade DTR to {{ previous_version }} if necessary Make sure you are running DTR {{ previous_version }}. If that is not the case, -[upgrade your installation to the {{ previous_version }} version](../{{ previous_version }}/guides/admin/upgrade/). +[upgrade your installation to the {{ previous_version }} version](/datacenter/dtr/{{ previous_version }}/guides/admin/upgrade/). ### Step 2. Upgrade DTR @@ -79,7 +79,7 @@ docker run -it --rm \ By default the upgrade command runs in interactive mode and prompts you for any necessary information. You can also check the -[reference documentation](/reference/dtr/2.6/cli/index.md) for other existing flags. +[reference documentation](/v18.09/reference/dtr/2.6/cli/index.md) for other existing flags. The upgrade command will start replacing every container in your DTR cluster, one replica at a time. It will also perform certain data migrations. If anything @@ -89,7 +89,7 @@ command and it will resume from where it left off. #### Metadata Store Migration -When upgrading from `2.5` to `2.6`, the system will run a `metadatastoremigration` job after a successful upgrade. This involves migrating the blob links for your images which is necessary for online garbage collection. With `2.6`, you can log in to the DTR web interface and navigate to **System > Job Logs** to check the status of the `metadatastoremigration` job. See [Audit Jobs via the Web Interface](/ee/dtr/admin/manage-jobs/audit-jobs-via-ui/) for more details. +When upgrading from `2.5` to `2.6`, the system will run a `metadatastoremigration` job after a successful upgrade. This involves migrating the blob links for your images which is necessary for online garbage collection. With `2.6`, you can log in to the DTR web interface and navigate to **System > Job Logs** to check the status of the `metadatastoremigration` job. See [Audit Jobs via the Web Interface](/manage-jobs/audit-jobs-via-ui/) for more details. ![](../images/migration-warning.png){: .with-border} @@ -102,7 +102,7 @@ If the three attempts fail, you will have to retrigger the `metadatastoremigrati ```bash curl https:///api/v0/jobs -X POST \ -u username:accesstoken -H 'Content-Type':'application/json' -d \ -'{"action": "metadatastoremigration"}' +'{"action": "metadatastoremigration"}' ``` Alternatively, select **API** from the bottom left navigation pane of the DTR web interface and use the Swagger UI to send your API request. @@ -113,7 +113,7 @@ upgrade. The command is the same as for a minor upgrade. ## DTR cache upgrade -If you have previously [deployed a cache](/ee/dtr/admin/configure/deploy-caches/), make sure to [upgrade the node dedicated for your cache](/ee/upgrade) to keep it in sync with your upstream DTR replicas. This prevents authentication errors and other weird behaviors. +If you have previously [deployed a cache](/admin/configure/deploy-caches/), make sure to [upgrade the node dedicated for your cache](/ee/upgrade) to keep it in sync with your upstream DTR replicas. This prevents authentication errors and other weird behaviors. ## Download the vulnerability database diff --git a/ee/dtr/admin/upgrade.md b/ee/dtr/admin/upgrade.md index 228f067291..57c3615098 100644 --- a/ee/dtr/admin/upgrade.md +++ b/ee/dtr/admin/upgrade.md @@ -54,7 +54,7 @@ are trying to upgrade to. [Check the compatibility matrix](https://success.docke ### Step 1. Upgrade DTR to {{ previous_version }} if necessary Make sure you are running DTR {{ previous_version }}. If that is not the case, -[upgrade your installation to the {{ previous_version }} version](../{{ previous_version }}/guides/admin/upgrade/). +[upgrade your installation to the {{ previous_version }} version](/datacenter/dtr/{{ previous_version }}/guides/admin/upgrade/). ### Step 2. Upgrade DTR @@ -102,7 +102,7 @@ If the three attempts fail, you will have to retrigger the `metadatastoremigrati ```bash curl https:///api/v0/jobs -X POST \ -u username:accesstoken -H 'Content-Type':'application/json' -d \ -'{"action": "metadatastoremigration"}' +'{"action": "metadatastoremigration"}' ``` Alternatively, select **API** from the bottom left navigation pane of the DTR web interface and use the Swagger UI to send your API request. From 648413c5d67c1027ade52094e99dc68e10743f58 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Thu, 17 Oct 2019 14:02:21 +0100 Subject: [PATCH 7/7] fix Desktop Edge download URLs (#9664) --- docker-for-mac/edge-release-notes.md | 2 +- docker-for-windows/edge-release-notes.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index a9fa1db423..3ed92e7e2c 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -15,7 +15,7 @@ notes](release-notes). For Docker Desktop system requirements, see ### Docker Desktop Community 2.1.4.0 2019-10-15 -[Download](https://download.docker.com/mac/edge/39097/Docker.dmg) +[Download](https://download.docker.com/mac/edge/39357/Docker.dmg) ### Upgrades diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index 3bbe0279da..88a6f1efe9 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/docker-for-windows/edge-release-notes.md @@ -15,7 +15,7 @@ notes](release-notes). For Docker Desktop system requirements, see ### Docker Desktop Community 2.1.4.0 2019-10-15 -[Download](https://download.docker.com/win/edge/39097/Docker%20Desktop%20Installer.exe) +[Download](https://download.docker.com/win/edge/39357/Docker%20Desktop%20Installer.exe) ### Upgrades