diff --git a/404.md b/404.md index a668cc2037..ef18d7af78 100644 --- a/404.md +++ b/404.md @@ -15,8 +15,7 @@ occurred, if applicable. [**Click here to create a new ticket**](https://github.com/docker/docker.github.io/issues/new){:.newissue.button.primary-btn} - -[![404 page not found](/images/404-docs.png)](https://docs.docker.com/ "Go to the homepage") +[![404 page not found](/images/404-docs.png)](/ "Go to the homepage") + diff --git a/_includes/landing-page/dev-environments.html b/_includes/landing-page/dev-environments.html index f971f83409..2aa3de0298 100644 --- a/_includes/landing-page/dev-environments.html +++ b/_includes/landing-page/dev-environments.html @@ -10,7 +10,7 @@
- + Check out the details
diff --git a/_includes/landing-page/docker-pricing.html b/_includes/landing-page/docker-pricing.html index fef8c4d214..ad1ea0c364 100644 --- a/_includes/landing-page/docker-pricing.html +++ b/_includes/landing-page/docker-pricing.html @@ -10,7 +10,7 @@
- + Learn more
diff --git a/_includes/landing-page/extensions-banner.html b/_includes/landing-page/extensions-banner.html index 17300cef9e..880c13ba1b 100644 --- a/_includes/landing-page/extensions-banner.html +++ b/_includes/landing-page/extensions-banner.html @@ -11,7 +11,7 @@ extensions
- + Start building
diff --git a/_includes/landing-page/volume-management.html b/_includes/landing-page/volume-management.html index 849986b430..c4bdb7c5bc 100644 --- a/_includes/landing-page/volume-management.html +++ b/_includes/landing-page/volume-management.html @@ -10,7 +10,7 @@
- + Learn more
diff --git a/_layouts/archive-redirect.html b/_layouts/archive-redirect.html index c055f0e547..7d9cd28875 100644 --- a/_layouts/archive-redirect.html +++ b/_layouts/archive-redirect.html @@ -6,9 +6,9 @@ layout: docs

{{ page.prod_title }}

You are viewing an archive branch of the - Docker documentation, but + Docker documentation, but {{ prod_title }} documentation is not published in the current archive. - Go to https://docs.docker.com/{{ page.prod_url }}/ + Go to {{ site.docs_url }}/{{ page.prod_url }}/ in a new tab.

\ No newline at end of file diff --git a/_layouts/docs.html b/_layouts/docs.html index 72d909136c..5ed270243b 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -8,7 +8,7 @@ {%- if page.issue_url -%} {%- assign issue_url = page.issue_url -%} {%- else -%} - {%- assign issue_url = "https://github.com/docker/docker.github.io/issues/new?body=File: [" | append: page.path | append: "](https://docs.docker.com" | append: page.url | append: ")" -%} + {%- assign issue_url = "https://github.com/docker/docker.github.io/issues/new?body=File: [" | append: page.path | append: "](" | append: site.docs_url | append: page.url | append: ")" -%} {%- endif -%} --> {%- include head.html -%} diff --git a/_layouts/engine-api.html b/_layouts/engine-api.html index 2ad45b84ac..0a9d6aa1f7 100644 --- a/_layouts/engine-api.html +++ b/_layouts/engine-api.html @@ -13,7 +13,7 @@ - + diff --git a/_layouts/hub-api.html b/_layouts/hub-api.html index d89e5cc456..22a7d42a78 100644 --- a/_layouts/hub-api.html +++ b/_layouts/hub-api.html @@ -13,7 +13,7 @@ - + diff --git a/_layouts/redirect.html b/_layouts/redirect.html index 3b9cece79e..96890ed6bf 100644 --- a/_layouts/redirect.html +++ b/_layouts/redirect.html @@ -2,15 +2,14 @@ Redirecting… - {%- assign redirect_to = page.redirect.to | remove_first: 'https://docs.docker.com' | remove_first: 'http://docs.docker.com' %} - {%- if redirect_to contains "://" %} - + {%- if page.redirect.to contains "://" %} + {%- else %} - + {%- endif %} - +

Redirecting…

- Click here if you are not redirected. - + Click here if you are not redirected. + diff --git a/_plugins/config.rb b/_plugins/config.rb new file mode 100644 index 0000000000..becfc70468 --- /dev/null +++ b/_plugins/config.rb @@ -0,0 +1,12 @@ +require_relative 'util.rb' + +module Jekyll + class ConfigGenerator < Generator + safe true + priority :highest + + def generate(site) + site.config['docs_url'] = get_docs_url + end + end +end diff --git a/_plugins/fetch_remote.rb b/_plugins/fetch_remote.rb index 8513fc5099..57ed8f77bb 100644 --- a/_plugins/fetch_remote.rb +++ b/_plugins/fetch_remote.rb @@ -6,6 +6,8 @@ require 'octopress-hooks' require 'open-uri' require 'rake' +require_relative 'util.rb' + module Jekyll class FetchRemote < Octopress::Hooks::Site priority :highest @@ -104,7 +106,7 @@ module Jekyll next unless File.file?(ent.path) && File.extname(ent.path) == ".md" # set edit and issue url and remote info for markdown files in site config defaults edit_url = "#{entry['repo']}/edit/#{entry['default_branch']}/#{file_clean}" - issue_url = "#{entry['repo']}/issues/new?body=File: [#{file_clean}](https://docs.docker.com/#{destent.path.sub(/#{File.extname(destent.path)}$/, '')}/)" + issue_url = "#{entry['repo']}/issues/new?body=File: [#{file_clean}](#{get_docs_url}/#{destent.path.sub(/#{File.extname(destent.path)}$/, '')}/)" puts " edit_url: #{edit_url}" puts " issue_url: #{issue_url}" site.config['defaults'] << { diff --git a/_plugins/fix_swagger.rb b/_plugins/fix_swagger.rb index 87352b4236..3a44ea062e 100644 --- a/_plugins/fix_swagger.rb +++ b/_plugins/fix_swagger.rb @@ -9,12 +9,16 @@ module Jekyll beginning_time = Time.now Jekyll.logger.info "Starting plugin fix_swagger.rb..." + # TODO: use dynamic URL from util.get_docs_url instead of hardcoded one + # but needs to remove first all absolute URLs in our code base. + docs_url = "https://docs.docker.com" + files = Dir.glob(%w[./docker-hub/api/*.yaml ./engine/api/*.yaml]) Jekyll.logger.info " Fixing up #{files.size} swagger file(s)..." files.each do |f| Jekyll.logger.info " #{f}" text = File.read(f) - replace = text.gsub(get_docs_url, "") + replace = text.gsub(docs_url, "") File.open(f, "w") { |f2| f2.puts replace } end diff --git a/_plugins/fix_url.rb b/_plugins/fix_url.rb index 90f641c4fa..d57750e2cc 100644 --- a/_plugins/fix_url.rb +++ b/_plugins/fix_url.rb @@ -13,8 +13,7 @@ module Jekyll # but needs to remove first all absolute URLs in our code base. docs_url = "https://docs.docker.com" - dest = site.config['destination'] || '_site' - files = Dir.glob("#{dest}/**/*.html") + files = Dir.glob("#{site.dest}/**/*.html") Jekyll.logger.info " Fixing up URLs in #{files.size} html file(s) to be relative" files.each do|f| text = File.read(f) diff --git a/compose/compose-file/build.md b/compose/compose-file/build.md index 9432f0d3d5..189d407b2f 100644 --- a/compose/compose-file/build.md +++ b/compose/compose-file/build.md @@ -301,5 +301,5 @@ build: ## Implementations -* [docker-compose](https://docs.docker.com/compose) +* [docker-compose](../../compose/index.md) * [buildx bake](../../build/bake/index.md) diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index 00dc0a9963..4f3db49f54 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -433,7 +433,7 @@ cgroup_parent: m-executor-abcd command: bundle exec thin -p 3000 ``` -The command can also be a list, in a manner similar to [Dockerfile](https://docs.docker.com/engine/reference/builder/#cmd): +The command can also be a list, in a manner similar to [Dockerfile](../../engine/reference/builder.md#cmd): ``` command: [ "bundle", "exec", "thin", "-p", "3000" ] @@ -737,7 +737,7 @@ entrypoint: /code/entrypoint.sh ``` The entrypoint can also be a list, in a manner similar to -[Dockerfile](https://docs.docker.com/engine/reference/builder/#cmd): +[Dockerfile](../../engine/reference/builder.md#cmd): ```yml entrypoint: @@ -1082,7 +1082,7 @@ been the case if `group_add` were not declared. `healthcheck` declares a check that's run to determine whether or not containers for this service are "healthy". This overrides -[HEALTHCHECK Dockerfile instruction](https://docs.docker.com/engine/reference/builder/#healthcheck) +[HEALTHCHECK Dockerfile instruction](../../engine/reference/builder.md#healthcheck) set by the service's Docker image. ```yml @@ -1756,7 +1756,7 @@ sysctls: You can only use sysctls that are namespaced in the kernel. Docker does not support changing sysctls inside a container that also modify the host system. For an overview of supported sysctls, refer to [configure namespaced kernel -parameters (sysctls) at runtime](https://docs.docker.com/engine/reference/commandline/run/#configure-namespaced-kernel-parameters-sysctls-at-runtime). +parameters (sysctls) at runtime](/engine/reference/commandline/run/#configure-namespaced-kernel-parameters-sysctls-at-runtime). ### tmpfs diff --git a/compose/release-notes.md b/compose/release-notes.md index 71bff9901f..43e1274e5e 100644 --- a/compose/release-notes.md +++ b/compose/release-notes.md @@ -2205,8 +2205,8 @@ naming scheme accordingly before upgrading. You don't have to use it - your existing Compose files will run on Compose 1.6 exactly as they do today. - Check the upgrade guide for full details: - https://docs.docker.com/compose/compose-file#upgrading + Check the [upgrade guide](../compose/compose-file/compose-versioning.md#upgrading) + for full details. - Support for networking has exited experimental status and is the recommended way to enable communication between containers. @@ -2217,8 +2217,7 @@ naming scheme accordingly before upgrading. By default, you don't have to configure any networks. In fact, using networking with Compose involves even less configuration than using links. - Consult the networking guide for how to use it: - https://docs.docker.com/compose/networking + Consult the [networking guide](../compose/networking.md) for how to use it. The experimental flags `--x-networking` and `--x-network-driver`, introduced in Compose 1.5, have been removed. diff --git a/desktop/extensions-sdk/dev/api/reference/interfaces/Docker.md b/desktop/extensions-sdk/dev/api/reference/interfaces/Docker.md index 420a486628..368a5f03b0 100644 --- a/desktop/extensions-sdk/dev/api/reference/interfaces/Docker.md +++ b/desktop/extensions-sdk/dev/api/reference/interfaces/Docker.md @@ -79,9 +79,9 @@ const containers = await ddClient.docker.listContainers(); #### Parameters -| Name | Type | Description | -| :------ | :------ | :------ | -| `options?` | `any` | (Optional). A JSON like `{ "all": true, "limit": 10, "size": true, "filters": JSON.stringify({ status: ["exited"] }), }` For more information about the different properties see [the Docker API endpoint documentation](https://docs.docker.com/engine/api/v1.37/#operation/ContainerList). | +| Name | Type | Description | +|:-----------|:------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `options?` | `any` | (Optional). A JSON like `{ "all": true, "limit": 10, "size": true, "filters": JSON.stringify({ status: ["exited"] }), }` For more information about the different properties see [the Docker API endpoint documentation](../../../../../../engine/api/v1.37.md#operation/ContainerList). | #### Returns @@ -101,9 +101,9 @@ const images = await ddClient.docker.listImages(); #### Parameters -| Name | Type | Description | -| :------ | :------ | :------ | -| `options?` | `any` | (Optional). A JSON like `{ "all": true, "filters": JSON.stringify({ dangling: ["true"] }), "digests": true }` For more information about the different properties see [the Docker API endpoint documentation](https://docs.docker.com/engine/api/v1.37/#tag/Image). | +| Name | Type | Description | +|:-----------|:------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `options?` | `any` | (Optional). A JSON like `{ "all": true, "filters": JSON.stringify({ dangling: ["true"] }), "digests": true }` For more information about the different properties see [the Docker API endpoint documentation](../../../../../../engine/api/v1.37.md#tag/Image). | #### Returns diff --git a/desktop/extensions-sdk/dev/api/reference/interfaces/DockerDesktopClient.md b/desktop/extensions-sdk/dev/api/reference/interfaces/DockerDesktopClient.md index 83b758bc02..4b0e5b749a 100644 --- a/desktop/extensions-sdk/dev/api/reference/interfaces/DockerDesktopClient.md +++ b/desktop/extensions-sdk/dev/api/reference/interfaces/DockerDesktopClient.md @@ -89,9 +89,9 @@ const containers = await window.ddClient.listContainers(); #### Parameters -| Name | Type | Description | -| :------ | :------ | :------ | -| `options` | `never` | (Optional). A JSON like `{ "all": true, "limit": 10, "size": true, "filters": JSON.stringify({ status: ["exited"] }), }` For more information about the different properties see [the Docker API endpoint documentation](https://docs.docker.com/engine/api/v1.37/#operation/ContainerList). | +| Name | Type | Description | +|:----------|:--------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `options` | `never` | (Optional). A JSON like `{ "all": true, "limit": 10, "size": true, "filters": JSON.stringify({ status: ["exited"] }), }` For more information about the different properties see [the Docker API endpoint documentation](../../../../../../engine/api/v1.37.md#operation/ContainerList). | #### Returns @@ -119,9 +119,9 @@ const images = await window.ddClient.listImages(); #### Parameters -| Name | Type | Description | -| :------ | :------ | :------ | -| `options` | `never` | (Optional). A JSON like `{ "all": true, "filters": JSON.stringify({ dangling: ["true"] }), "digests": true }` For more information about the different properties see [the Docker API endpoint documentation](https://docs.docker.com/engine/api/v1.37/#tag/Image). | +| Name | Type | Description | +|:----------|:--------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `options` | `never` | (Optional). A JSON like `{ "all": true, "filters": JSON.stringify({ dangling: ["true"] }), "digests": true }` For more information about the different properties see [the Docker API endpoint documentation](../../../../../../engine/api/v1.37.md#tag/Image). | #### Returns diff --git a/desktop/extensions-sdk/extensions/METADATA.md b/desktop/extensions-sdk/extensions/METADATA.md index 5b60b4387d..88755cab01 100644 --- a/desktop/extensions-sdk/extensions/METADATA.md +++ b/desktop/extensions-sdk/extensions/METADATA.md @@ -98,7 +98,7 @@ services: ### Use the docker socket from your extension backend -Docker extensions can invoke Docker commands directly from the frontend with the SDK. In some cases, it is useful to also interact with the Docker engine from the backend. Extension backend containers can mount the Docker socket and use it to interact with the Docker engine from the extension backend logic. (Learn more about the [Docker engine socket](https://docs.docker.com/engine/reference/commandline/dockerd/#examples)) +Docker extensions can invoke Docker commands directly from the frontend with the SDK. In some cases, it is useful to also interact with the Docker engine from the backend. Extension backend containers can mount the Docker socket and use it to interact with the Docker engine from the extension backend logic. (Learn more about the [Docker engine socket](/engine/reference/commandline/dockerd/#examples)) However, when mounting the docker socket from an extension container that lives in the Desktop virtual machine, you want to mount the Docker socket from inside the VM, and not mount `/var/run/docker.sock` from the host filsystem (using the Docker socket from the host can lead to permission issues in containers). In order to do so, you can use `/var/run/docker.sock.raw`. Docker Desktop mounts the socket that lives in the Desktop VM, and not from the host. diff --git a/desktop/extensions-sdk/extensions/labels.md b/desktop/extensions-sdk/extensions/labels.md index 3c2b9094db..ca179b692c 100644 --- a/desktop/extensions-sdk/extensions/labels.md +++ b/desktop/extensions-sdk/extensions/labels.md @@ -4,21 +4,21 @@ description: Docker extension labels keywords: Docker, extensions, sdk, labels --- -[Labels](https://docs.docker.com/engine/reference/builder/#label) are specified in the extension's `Dockerfile` and used to provide information about the extension. +[Labels](../../../engine/reference/builder.md#label) are specified in the extension's `Dockerfile` and used to provide information about the extension. -| Label | Required | Description | Example | -| --- | --- | --- | ---| -| `org.opencontainers.image.title` | Yes | Human-readable title of the image (string). This appears in the UI for Docker Desktop. | my-extension | -| `org.opencontainers.image.description` | Yes | Human-readable description of the software packaged in the image (string) | This extension is cool.| -| `org.opencontainers.image.vendor` | Yes | Name of the distributing entity, organization, or individual. | Acme, Inc. | -| `com.docker.desktop.extension.api.version` | Yes | Version of the Docker Extension manager that the extension is compatible with. It must follow [semantic versioning](https://semver.org/). | A specific version like `0.1.0` or, a constraint expression: `>= 0.1.0`, `>= 1.4.7, < 2.0` . For your first extension, you can use `docker extension version` to know the SDK API version and specify `>= `.| -| `com.docker.desktop.extension.icon` | No | The extension icon (format: .svg .png .jpg) | https://docs.docker.com/images/engine.svg | -| `com.docker.extension.screenshots` | No | A JSON array of image URLs and an alternative text displayed to users (in the order they appear in your metadata) in your extension's details page. **Note:** The recommended size for sceenshots is 2400x1600 pixels. | `"[{"alt":"alternative text for image 1",` `"url":"https://foo.bar/image1.png"},` `{"alt":"alternative text for image2",` `"url":"https://foo.bar/image2.jpg"}]"` | -| `com.docker.extension.detailed-description` | No | Additional information in plain text or HTML about the extension to be displayed in the details dialog. | `My detailed description` or `

My detailed description

` | -| `com.docker.extension.publisher-url` | No | The publisher website URL to be displayed in the details dialog. | `https://foo.bar` | -| `com.docker.extension.additional-urls` | No | A JSON array of titles and additional URLs displayed to users (in the order they appear in your metadata) in your extension's details page. We recommend you display the following links if they apply: documentation, support, terms of service, and privacy policy links. | `[{"title":"Documentation","url":"https://foo.bar/docs"},` `{"title":"Support","url":"https://foo.bar/support"},` `{"title":"Terms of Service","url":"https://foo.bar/tos"},` `{"title":"Privacy policy","url":"https://foo.bar/privacy-policy"}]` | -| `com.docker.extension.changelog` | No | Changelog in plain text or HTML containing the change for the current version only. | `Extension changelog` or `

Extension changelog

` | -| `com.docker.extension.account-info` | No | Whether the user needs to sign up or log in to a SaaS platform to use some features of the extension. | `required` in case it does, leave it empty otherwise. | +| Label | Required | Description | Example | +|---------------------------------------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `org.opencontainers.image.title` | Yes | Human-readable title of the image (string). This appears in the UI for Docker Desktop. | my-extension | +| `org.opencontainers.image.description` | Yes | Human-readable description of the software packaged in the image (string) | This extension is cool. | +| `org.opencontainers.image.vendor` | Yes | Name of the distributing entity, organization, or individual. | Acme, Inc. | +| `com.docker.desktop.extension.api.version` | Yes | Version of the Docker Extension manager that the extension is compatible with. It must follow [semantic versioning](https://semver.org/). | A specific version like `0.1.0` or, a constraint expression: `>= 0.1.0`, `>= 1.4.7, < 2.0` . For your first extension, you can use `docker extension version` to know the SDK API version and specify `>= `. | +| `com.docker.desktop.extension.icon` | No | The extension icon (format: .svg .png .jpg) | {{ site.docs_url }}/images/engine.svg | +| `com.docker.extension.screenshots` | No | A JSON array of image URLs and an alternative text displayed to users (in the order they appear in your metadata) in your extension's details page. **Note:** The recommended size for sceenshots is 2400x1600 pixels. | `"[{"alt":"alternative text for image 1",` `"url":"https://foo.bar/image1.png"},` `{"alt":"alternative text for image2",` `"url":"https://foo.bar/image2.jpg"}]"` | +| `com.docker.extension.detailed-description` | No | Additional information in plain text or HTML about the extension to be displayed in the details dialog. | `My detailed description` or `

My detailed description

` | +| `com.docker.extension.publisher-url` | No | The publisher website URL to be displayed in the details dialog. | `https://foo.bar` | +| `com.docker.extension.additional-urls` | No | A JSON array of titles and additional URLs displayed to users (in the order they appear in your metadata) in your extension's details page. We recommend you display the following links if they apply: documentation, support, terms of service, and privacy policy links. | `[{"title":"Documentation","url":"https://foo.bar/docs"},` `{"title":"Support","url":"https://foo.bar/support"},` `{"title":"Terms of Service","url":"https://foo.bar/tos"},` `{"title":"Privacy policy","url":"https://foo.bar/privacy-policy"}]` | +| `com.docker.extension.changelog` | No | Changelog in plain text or HTML containing the change for the current version only. | `Extension changelog` or `

Extension changelog

` | +| `com.docker.extension.account-info` | No | Whether the user needs to sign up or log in to a SaaS platform to use some features of the extension. | `required` in case it does, leave it empty otherwise. | > Missing required labels > diff --git a/desktop/get-started.md b/desktop/get-started.md index a393cfaa8b..9426dafdf4 100644 --- a/desktop/get-started.md +++ b/desktop/get-started.md @@ -43,9 +43,9 @@ We recommend that you authenticate using the **Sign in/Create ID** option in the Once logged in, you can access your Docker Hub repositories directly from Docker Desktop. -Authenticated users get a higher pull rate limit compared to anonymous users. For example, if you are authenticated, you get 200 pulls per 6 hour period, compared to 100 pulls per 6 hour period per IP address for anonymous users. For more information, see [Download rate limit](https://docs.docker.com/docker-hub/download-rate-limit/). +Authenticated users get a higher pull rate limit compared to anonymous users. For example, if you are authenticated, you get 200 pulls per 6 hour period, compared to 100 pulls per 6 hour period per IP address for anonymous users. For more information, see [Download rate limit](../docker-hub/download-rate-limit.md). -In large enterprises where admin access is restricted, administrators can create a registry.json file and deploy it to the developers’ machines using a device management software as part of the Docker Desktop installation process. Enforcing developers to authenticate through Docker Desktop also allows administrators to set up guardrails using features such as [Image Access Management](https://docs.docker.com/docker-hub/image-access-management/) which allows team members to only have access to Trusted Content on Docker Hub, and pull only from the specified categories of images. For more information, see Configure registry.json to enforce sign in https://docs.docker.com/docker-hub/configure-sign-in/. +In large enterprises where admin access is restricted, administrators can create a registry.json file and deploy it to the developers’ machines using a device management software as part of the Docker Desktop installation process. Enforcing developers to authenticate through Docker Desktop also allows administrators to set up guardrails using features such as [Image Access Management](../docker-hub/image-access-management.md) which allows team members to only have access to Trusted Content on Docker Hub, and pull only from the specified categories of images. For more information, see [Configure registry.json to enforce sign in](../docker-hub/configure-sign-in.md). ### Two-factor authentication diff --git a/desktop/previous-versions/2.x-mac.md b/desktop/previous-versions/2.x-mac.md index 7a1fd7f946..3e0ec2ffef 100644 --- a/desktop/previous-versions/2.x-mac.md +++ b/desktop/previous-versions/2.x-mac.md @@ -132,7 +132,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New -- The new Cloud integration in Docker CLI makes it easy to run containers in the cloud using either Amazon ECS or Microsoft ACI. For more information, see [Deploying Docker containers on ECS](https://docs.docker.com/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](https://docs.docker.com/engine/context/aci-integration/). +- The new Cloud integration in Docker CLI makes it easy to run containers in the cloud using either Amazon ECS or Microsoft ACI. For more information, see [Deploying Docker containers on ECS](/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](/engine/context/aci-integration/). ### Upgrades diff --git a/desktop/previous-versions/2.x-windows.md b/desktop/previous-versions/2.x-windows.md index e7d9b3ccb0..ba8aef43d3 100644 --- a/desktop/previous-versions/2.x-windows.md +++ b/desktop/previous-versions/2.x-windows.md @@ -150,7 +150,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus ### New -- The new Cloud integration in Docker CLI makes it easy to run containers in the cloud using either Amazon ECS or Microsoft ACI. For more information, see [Deploying Docker containers on ECS](https://docs.docker.com/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](https://docs.docker.com/engine/context/aci-integration/). +- The new Cloud integration in Docker CLI makes it easy to run containers in the cloud using either Amazon ECS or Microsoft ACI. For more information, see [Deploying Docker containers on ECS](/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](/engine/context/aci-integration/). ### Upgrades diff --git a/desktop/previous-versions/3.x-mac.md b/desktop/previous-versions/3.x-mac.md index 74c1f3b9c3..f46c8762c0 100644 --- a/desktop/previous-versions/3.x-mac.md +++ b/desktop/previous-versions/3.x-mac.md @@ -45,7 +45,7 @@ This page contains information about the new features, improvements, known issue - Allow setting 0 scale/replicas. - Detect new container on logs —follow. - [Go 1.16.7](https://github.com/golang/go/releases/tag/go1.16.7) -- [Docker Engine 20.10.8](https://docs.docker.com/engine/release-notes/#20108) +- [Docker Engine 20.10.8](../../engine/release-notes/index.md#20108) - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9) - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1) - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3) @@ -179,7 +179,7 @@ This page contains information about the new features, improvements, known issue ### Upgrades -- [Docker Engine 20.10.7](https://docs.docker.com/engine/release-notes/#20107) +- [Docker Engine 20.10.7](../../engine/release-notes/index.md#20107) - [Docker Compose 1.29.2](https://github.com/docker/compose/releases/tag/1.29.2) - [Docker Hub Tool v0.4.1](https://github.com/docker/hub-tool/releases/tag/v0.4.1) - [Compose CLI v1.0.16](https://github.com/docker/compose-cli/releases/tag/v1.0.16) @@ -242,7 +242,7 @@ This page contains information about the new features, improvements, known issue - [Compose CLI v1.0.14](https://github.com/docker/compose-cli/tree/v1.0.14) - [Go 1.16.3](https://golang.org/doc/go1.16) - [Docker Compose 1.29.1](https://github.com/docker/compose/releases/tag/1.29.1) -- [Docker Engine 20.10.6](https://docs.docker.com/engine/release-notes/#20106) +- [Docker Engine 20.10.6](../../engine/release-notes/index.md#20106) ### Bug fixes and minor changes @@ -353,7 +353,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.5](https://docs.docker.com/engine/release-notes/#20105) +- [Docker Engine 20.10.5](../../engine/release-notes/index.md#20105) ### Bug fixes and minor changes @@ -383,7 +383,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.3](https://docs.docker.com/engine/release-notes/#20103) +- [Docker Engine 20.10.3](../../engine/release-notes/index.md#20103) - [Docker Compose 1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [Compose CLI v1.0.9](https://github.com/docker/compose-cli/tree/v1.0.9) - [Docker Hub Tool v0.3.0](https://github.com/docker/hub-tool/releases/tag/v0.3.0) @@ -441,7 +441,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y ### Upgrades -- [Docker Engine 20.10.2](https://docs.docker.com/engine/release-notes/#20102) +- [Docker Engine 20.10.2](../../engine/release-notes/index.md#20102) ### Bug fixes and minor changes @@ -532,7 +532,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y ### Upgrades -- [Docker Engine 20.10.0](https://docs.docker.com/engine/release-notes/#20100) +- [Docker Engine 20.10.0](../../engine/release-notes/index.md#20100) - [Go 1.15.6](https://github.com/golang/go/issues?q=milestone%3AGo1.15.6+label%3ACherryPickApproved+) - [Compose CLI v1.0.4](https://github.com/docker/compose-cli/releases/tag/v1.0.4) - [Snyk v1.432.0](https://github.com/snyk/snyk/releases/tag/v1.432.0) diff --git a/desktop/previous-versions/3.x-windows.md b/desktop/previous-versions/3.x-windows.md index 139fc425bf..24ee715324 100644 --- a/desktop/previous-versions/3.x-windows.md +++ b/desktop/previous-versions/3.x-windows.md @@ -44,7 +44,7 @@ This page contains information about the new features, improvements, known issue - Allow setting 0 scale/replicas. - Detect new container on logs —follow. - [Go 1.16.7](https://github.com/golang/go/releases/tag/go1.16.7) -- [Docker Engine 20.10.8](https://docs.docker.com/engine/release-notes/#20108) +- [Docker Engine 20.10.8](../../engine/release-notes/index.md#20108) - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9) - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1) - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3) @@ -181,7 +181,7 @@ This page contains information about the new features, improvements, known issue ### Upgrades -- [Docker Engine 20.10.7](https://docs.docker.com/engine/release-notes/#20107) +- [Docker Engine 20.10.7](../../engine/release-notes/index.md#20107) - [Docker Compose 1.29.2](https://github.com/docker/compose/releases/tag/1.29.2) - [Docker Hub Tool v0.4.1](https://github.com/docker/hub-tool/releases/tag/v0.4.1) - [Compose CLI v1.0.16](https://github.com/docker/compose-cli/releases/tag/v1.0.16) @@ -233,7 +233,7 @@ This page contains information about the new features, improvements, known issue - [Compose CLI v1.0.14](https://github.com/docker/compose-cli/tree/v1.0.14) - [Go 1.16.3](https://golang.org/doc/go1.16) - [Docker Compose 1.29.1](https://github.com/docker/compose/releases/tag/1.29.1) -- [Docker Engine 20.10.6](https://docs.docker.com/engine/release-notes/#20106) +- [Docker Engine 20.10.6](../../engine/release-notes/index.md#20106) ### Bug fixes and minor changes @@ -321,7 +321,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.5](https://docs.docker.com/engine/release-notes/#20105) +- [Docker Engine 20.10.5](../../engine/release-notes/index.md#20105) ## Docker Desktop 3.2.0 2021-03-01 @@ -345,7 +345,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.3](https://docs.docker.com/engine/release-notes/#20103) +- [Docker Engine 20.10.3](../../engine/release-notes/index.md#20103) - [Docker Compose 1.28.5](https://github.com/docker/compose/releases/tag/1.28.5) - [Compose CLI v1.0.9](https://github.com/docker/compose-cli/tree/v1.0.9) - [Docker Hub Tool v0.3.0](https://github.com/docker/hub-tool/releases/tag/v0.3.0) @@ -407,7 +407,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.2](https://docs.docker.com/engine/release-notes/#20102) +- [Docker Engine 20.10.2](../../engine/release-notes/index.md#20102) ### Bug fixes and minor changes @@ -436,7 +436,7 @@ For developers in IT managed environments, who don’t have administrative acces ### Upgrades -- [Docker Engine 20.10.0](https://docs.docker.com/engine/release-notes/#20100) +- [Docker Engine 20.10.0](../../engine/release-notes/index.md#20100) - [Go 1.15.6](https://github.com/golang/go/issues?q=milestone%3AGo1.15.6+label%3ACherryPickApproved+) - [Compose CLI v1.0.4](https://github.com/docker/compose-cli/releases/tag/v1.0.4) - [Snyk v1.432.0](https://github.com/snyk/snyk/releases/tag/v1.432.0) diff --git a/desktop/previous-versions/archive-mac.md b/desktop/previous-versions/archive-mac.md index 30f8ad7346..b85502c8f6 100644 --- a/desktop/previous-versions/archive-mac.md +++ b/desktop/previous-versions/archive-mac.md @@ -47,7 +47,7 @@ This page contains release notes for older versions of Docker Desktop for Mac. - Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [backup volumes](../../storage/volumes.md#backup-restore-or-migrate-data-volumes) - OS X El Captain 10.11 is deprecated in Docker Desktop. You will not be able to install updates after Docker Desktop 18.06.x. We recommend upgrading to the latest version of macOS. - Fix bug which would cause VM logs to be written to RAM rather than disk in some cases, and the VM to hang. See [docker/for-mac#2984](https://github.com/docker/for-mac/issues/2984) - Fix network connection leak triggered by haproxy TCP health-checks [docker/for-mac#1132](https://github.com/docker/for-mac/issues/1132) diff --git a/desktop/previous-versions/archive-windows.md b/desktop/previous-versions/archive-windows.md index f70247d8e4..5b37f410dd 100644 --- a/desktop/previous-versions/archive-windows.md +++ b/desktop/previous-versions/archive-windows.md @@ -67,7 +67,7 @@ This page contains release notes for older versions of Docker Desktop for Window - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](../kubernetes.md) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [backup volumes](../../storage/volumes.md#backup-restore-or-migrate-data-volumes) - Fix bug which would in some cases cause virtual machine logs to be written to RAM rather than disk, and the virtual machine to hang. - Fix security issue with named pipe connection to docker service. - Fix VPNKit memory leak. Fixes [docker/for-win#2087](https://github.com/docker/for-win/issues/2087), [moby/vpnkit#371](https://github.com/moby/vpnkit/issues/371) diff --git a/desktop/previous-versions/edge-releases-mac.md b/desktop/previous-versions/edge-releases-mac.md index b17b69c012..71507b2053 100644 --- a/desktop/previous-versions/edge-releases-mac.md +++ b/desktop/previous-versions/edge-releases-mac.md @@ -218,8 +218,8 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ### New -- In partnership with Snyk, Docker Desktop launches [vulnerability scanning](https://docs.docker.com/engine/scan/) for Docker local images. -- Docker ECS plugin has been replaced by [ECS cloud integration](https://docs.docker.com/engine/context/ecs-integration/) +- In partnership with Snyk, Docker Desktop launches [vulnerability scanning](../../engine/scan/index.md) for Docker local images. +- Docker ECS plugin has been replaced by [ECS cloud integration](/engine/context/ecs-integration/) - Docker UI: - The Images view now has search and filter options. - You can now push an image to Docker Hub using the Remote repositories drop-down menu. @@ -327,7 +327,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ### Upgrades -- Beta release of [Docker ECS integration v1.0.0-beta.1](https://docs.docker.com/engine/context/ecs-integration/) +- Beta release of [Docker ECS integration v1.0.0-beta.1](/engine/context/ecs-integration/) - [Docker ACI integration v0.1.7](https://github.com/docker/aci-integration-beta/releases/tag/v0.1.7) - [Docker Compose 1.26.2](https://github.com/docker/compose/releases/tag/1.26.2) @@ -352,7 +352,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for - [Docker 19.03.12](https://github.com/docker/docker-ce/releases/tag/v19.03.12) - [Docker Compose 1.26.0](https://github.com/docker/compose/releases/tag/1.26.0) - [Kubernetes 1.18.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.18.3) -- Beta release of the [Docker ACI integration](https://docs.docker.com/engine/context/aci-integration/) +- Beta release of the [Docker ACI integration](/engine/context/aci-integration/) ### Bug fixes and minor changes @@ -950,7 +950,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721) * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Preferences > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [backup volumes](../../storage/volumes.md#backup-restore-or-migrate-data-volumes) - Fix startup issue with AUFS [docker/for-mac#2804](https://github.com/docker/for-mac/issues/2804) - Fix status bug which could prevent the Kubernetes cluster from starting. Fixes [docker/for-mac#2990](https://github.com/docker/for-mac/issues/2990) - Fix bug which would cause virtual machine logs to be written to RAM rather than disk in some cases, and the virtual machine to hang. See [docker/for-mac#2984](https://github.com/docker/for-mac/issues/2984) @@ -2287,7 +2287,7 @@ events or unexpected unmounts. **Bug fixes and minor changes** -* Documentation moved to [https://docs.docker.com/desktop/mac/](../index.md) +* Documentation moved to [/desktop/mac/](../index.md) * Allow non-admin users to launch the app for the first time (using admin creds) * Prompt non-admin users for admin password when needed in Preferences * Fixed download links, documentation links diff --git a/desktop/previous-versions/edge-releases-windows.md b/desktop/previous-versions/edge-releases-windows.md index 3ba8739d18..49dd4f167a 100644 --- a/desktop/previous-versions/edge-releases-windows.md +++ b/desktop/previous-versions/edge-releases-windows.md @@ -211,7 +211,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ### New - In partnership with Snyk, Docker Desktop launches [vulnerability scanning](../../engine/scan/index.md) for Docker local images. -- Docker ECS plugin has been replaced by [ECS cloud integration](https://docs.docker.com/engine/context/ecs-integration/) +- Docker ECS plugin has been replaced by [ECS cloud integration](/engine/context/ecs-integration/) - Docker UI: - The Images view now has search and filter options. - You can now push an image to Docker Hub using the Remote repositories drop-down menu. @@ -333,7 +333,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ### Upgrades -- Beta release of [Docker ECS integration v1.0.0-beta.1.](https://docs.docker.com/engine/context/ecs-integration/) +- Beta release of [Docker ECS integration v1.0.0-beta.1.](/engine/context/ecs-integration/) - [Docker ACI integration v0.1.7](https://github.com/docker/aci-integration-beta/releases/tag/v0.1.7) - [Docker Compose 1.26.2](https://github.com/docker/compose/releases/tag/1.26.2) @@ -362,7 +362,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for - [Docker 19.03.12](https://github.com/docker/docker-ce/releases/tag/v19.03.12) - [Docker Compose 1.26.0](https://github.com/docker/compose/releases/tag/1.26.0) - [Kubernetes 1.18.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.18.3) -- Beta release of the [Docker ACI integration](https://docs.docker.com/engine/context/aci-integration/) +- Beta release of the [Docker ACI integration](/engine/context/aci-integration/) ### Bug fixes and minor changes @@ -1162,7 +1162,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - New Kubernetes menu item allowing to switch Kubernetes context & connect to clusters other than the local one. * Bug fixes and minor changes - - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes) + - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](/engine/reference/commandline/save/#examples) and [backup volumes](../../storage/volumes.md#backup-restore-or-migrate-data-volumes) - Fix startup issue with AUFS - Fix status bug which could prevent the kubernetes cluster from starting. - Fix bug which would cause VM logs to be written to RAM rather than disk in some cases, and the VM to hang. diff --git a/desktop/release-notes.md b/desktop/release-notes.md index 26ad7bbe54..e99e8487c2 100644 --- a/desktop/release-notes.md +++ b/desktop/release-notes.md @@ -176,7 +176,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge - Removed Homepage while working on a new design. You can provide [feedback here](https://docs.google.com/forms/d/e/1FAIpQLSfYueBkJHdgxqsWcQn4VzBn2swu4u_rMQRIMa8LExYb_72mmQ/viewform?entry.1237514594=4.10). ### Upgrades -- [Docker Engine v20.10.17](https://docs.docker.com/engine/release-notes/#201017) +- [Docker Engine v20.10.17](../engine/release-notes/index.md#201017) - [Docker Compose v2.6.1](https://github.com/docker/compose/releases/tag/v2.6.1) - [Kubernetes v1.24.1](https://github.com/kubernetes/kubernetes/releases/tag/v1.24.1) - [cri-dockerd to v0.2.1](https://github.com/Mirantis/cri-dockerd/releases/tag/v0.2.1) @@ -270,7 +270,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### Upgrades - [Compose v2.6.0](https://github.com/docker/compose/releases/tag/v2.6.0) -- [Docker Engine v20.10.16](https://docs.docker.com/engine/release-notes/#201016) +- [Docker Engine v20.10.16](../engine/release-notes/index.md#201016) - [containerd v1.6.4](https://github.com/containerd/containerd/releases/tag/v1.6.4) - [runc v1.1.1](https://github.com/opencontainers/runc/releases/tag/v1.1.1) - [Go 1.18.2](https://github.com/golang/go/releases/tag/go1.18.2) @@ -343,7 +343,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### New - Released [Docker Desktop for Linux](install/linux-install.md). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. +- Beta release of [Docker Extensions](extensions.md) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) @@ -372,7 +372,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### New - Released [Docker Desktop for Linux](install/linux-install.md). -- Beta release of [Docker Extensions](https://docs.docker.com/desktop/extensions) and Extensions SDK. +- Beta release of [Docker Extensions](extensions.md) and Extensions SDK. - Created a Docker Homepage where you can run popular images and discover how to use them. - [Compose V2 is now GA](https://www.docker.com/blog/announcing-compose-v2-general-availability/) @@ -468,7 +468,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge ### Upgrades -- [Docker Engine v20.10.14](https://docs.docker.com/engine/release-notes/#201014) +- [Docker Engine v20.10.14](../engine/release-notes/index.md#201014) - [Compose v2.4.1](https://github.com/docker/compose/releases/tag/v2.4.1) - [Buildx 0.8.2](https://github.com/docker/buildx/releases/tag/v0.8.2) - [containerd v1.5.11](https://github.com/containerd/containerd/releases/tag/v1.5.11) @@ -546,7 +546,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge #### For all platforms -- [Docker Engine v20.10.13](https://docs.docker.com/engine/release-notes/#201013) +- [Docker Engine v20.10.13](../engine/release-notes/index.md#201013) - [Compose v2.3.3](https://github.com/docker/compose/releases/tag/v2.3.3) - [Buildx 0.8.0](https://github.com/docker/buildx/releases/tag/v0.8.0) - [containerd v1.4.13](https://github.com/containerd/containerd/releases/tag/v1.4.13) @@ -707,7 +707,7 @@ Installing Docker Desktop 4.5.0 from scratch has a bug which defaults Docker Des ### Security -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. +- Fixed [CVE-2021-45449](../security/index.md#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. @@ -720,7 +720,7 @@ This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user ### Upgrades -- [Docker Engine v20.10.12](https://docs.docker.com/engine/release-notes/#201012) +- [Docker Engine v20.10.12](../engine/release-notes/index.md#201012) - [Compose v2.2.3](https://github.com/docker/compose/releases/tag/v2.2.3) - [Kubernetes 1.22.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.22.5) - [docker scan v0.16.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.16.0){: target="_blank" rel="noopener" class="_"} @@ -765,7 +765,7 @@ This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user ### Security -- Fixed [CVE-2021-45449](https://docs.docker.com/security/#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. +- Fixed [CVE-2021-45449](../security/index.md#cve-2021-45449) that affects users currently on Docker Desktop version 4.3.0 or 4.3.1. Docker Desktop version 4.3.0 and 4.3.1 has a bug that may log sensitive information (access token or password) on the user's machine during login. This only affects users if they are on Docker Desktop 4.3.0, 4.3.1 and the user has logged in while on 4.3.0, 4.3.1. Gaining access to this data would require having access to the user’s local files. @@ -822,7 +822,7 @@ CVE-2021-44228](https://www.docker.com/blog/apache-log4j-2-cve-2021-44228/){: ta ### Upgrades -- [Docker Engine v20.10.11](https://docs.docker.com/engine/release-notes/#201011) +- [Docker Engine v20.10.11](../engine/release-notes/index.md#201011) - [containerd v1.4.12](https://github.com/containerd/containerd/releases/tag/v1.4.12) - [Buildx 0.7.1](https://github.com/docker/buildx/releases/tag/v0.7.1) - [Compose v2.2.1](https://github.com/docker/compose/releases/tag/v2.2.1) @@ -887,7 +887,7 @@ actual memory usage. See ### Upgrades -- [Docker Engine v20.10.10](https://docs.docker.com/engine/release-notes/#201010) +- [Docker Engine v20.10.10](../engine/release-notes/index.md#201010) - [containerd v1.4.11](https://github.com/containerd/containerd/releases/tag/v1.4.11) - [runc v1.0.2](https://github.com/opencontainers/runc/releases/tag/v1.0.2) - [Go 1.17.2](https://golang.org/doc/go1.17) diff --git a/docker-hub/deactivate-account.md b/docker-hub/deactivate-account.md index 1c3d2033bb..57ef41c8e9 100644 --- a/docker-hub/deactivate-account.md +++ b/docker-hub/deactivate-account.md @@ -25,7 +25,7 @@ Before deactivating your Docker Hub account, please complete the following: 5. 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. -6. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account). +6. Unlink your [Github and Bitbucket accounts](builds/link-source.md#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**. @@ -46,7 +46,7 @@ Before deactivating an organization, please complete the following: 3. Remove all other members, including those in the **Owners** team, within the organization. -4. Unlink your [Github and Bitbucket accounts](https://docs.docker.com/docker-hub/builds/link-source/#unlink-a-github-user-account). +4. Unlink your [Github and Bitbucket accounts](builds/link-source.md#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**. diff --git a/docker-hub/download-rate-limit.md b/docker-hub/download-rate-limit.md index 9ad0077eb0..93cf1dc888 100644 --- a/docker-hub/download-rate-limit.md +++ b/docker-hub/download-rate-limit.md @@ -7,7 +7,7 @@ title: Download rate limit ## What is the download rate limit on Docker Hub Docker Hub limits the number of Docker image downloads ("pulls") -based on the account type of the user pulling the image. Pull rates limits are based on individual IP address. For anonymous users, the rate limit is set to 100 pulls per 6 hours per IP address. For [authenticated](#how-do-i-authenticate-pull-requests) users, it is 200 pulls per 6 hour period. Users with a paid [Docker subscription](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} get up to 5000 pulls per day. If you require a higher number of pulls, you can also purchase an [Enhanced Service Account add-on](https://docs.docker.com/docker-hub/service-accounts/#enhanced-service-account-add-on-pricing). +based on the account type of the user pulling the image. Pull rates limits are based on individual IP address. For anonymous users, the rate limit is set to 100 pulls per 6 hours per IP address. For [authenticated](#how-do-i-authenticate-pull-requests) users, it is 200 pulls per 6 hour period. Users with a paid [Docker subscription](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} get up to 5000 pulls per day. If you require a higher number of pulls, you can also purchase an [Enhanced Service Account add-on](service-accounts.md#enhanced-service-account-add-on-pricing). Some images are unlimited through our [Open Source](https://www.docker.com/blog/expanded-support-for-open-source-software-projects/){: target="_blank" rel="noopener" class="_"} and [Publisher](https://www.docker.com/partners/programs){: target="_blank" rel="noopener" class="_"} programs. diff --git a/docker-hub/publish/publisher_faq.md b/docker-hub/publish/publisher_faq.md index 5971a9bad7..ba20fe3d39 100644 --- a/docker-hub/publish/publisher_faq.md +++ b/docker-hub/publish/publisher_faq.md @@ -194,4 +194,4 @@ You will need to apply for access. Please either follow [this direct link](https ### What kind of DockerID should I use to publish my content? -Publishing should be done with an [Organization level DockerID](https://docs.docker.com/docker-hub/orgs/). We recommend that this account utilize a shared alias with your corporate email account and only individual DockerIDs with company email are added to that organization. +Publishing should be done with an [Organization level DockerID](../orgs.md). We recommend that this account utilize a shared alias with your corporate email account and only individual DockerIDs with company email are added to that organization. diff --git a/docker-hub/repos.md b/docker-hub/repos.md index ce74d85814..5542bcccd9 100644 --- a/docker-hub/repos.md +++ b/docker-hub/repos.md @@ -9,7 +9,7 @@ redirect_from: Docker Hub repositories allow you share container images with your team, customers, or the Docker community at large. -Docker images are pushed to Docker Hub through the [`docker push`](https://docs.docker.com/engine/reference/commandline/push/) +Docker images are pushed to Docker Hub through the [`docker push`](/engine/reference/commandline/push/) command. A single Docker Hub repository can hold many Docker images (stored as **tags**). diff --git a/engine/release-notes/18.06.md b/engine/release-notes/18.06.md index 729888e0df..b206b75708 100644 --- a/engine/release-notes/18.06.md +++ b/engine/release-notes/18.06.md @@ -52,7 +52,7 @@ skip_read_time: true ### Important notes about this release -- Docker 18.06 CE will be the last release with a 4-month maintenance lifecycle. The planned Docker 18.09 CE release will be supported for 7 months with Docker 19.03 CE being the next release in line. More details about the release process can be found [here](https://docs.docker.com/install/). +- Docker 18.06 CE will be the last release with a 4-month maintenance lifecycle. The planned Docker 18.09 CE release will be supported for 7 months with Docker 19.03 CE being the next release in line. More details about the release process can be found [here](../../get-docker.md). ### Builder @@ -185,7 +185,7 @@ skip_read_time: true * Set item-type for ExecIDs. [moby/moby#37121](https://github.com/moby/moby/pull/37121) * Use go-systemd const instead of magic string in Linux version of dockerd. [moby/moby#37136](https://github.com/moby/moby/pull/37136) * Use stdlib TLS dialer. [moby/moby#36687](https://github.com/moby/moby/pull/36687) -* Warn when an engine label using a reserved namespace (com.docker.\*, io.docker.\*, or org.dockerproject.\*) is configured, as per https://docs.docker.com/config/labels-custom-metadata/. [moby/moby#36921](https://github.com/moby/moby/pull/36921) +* Warn when an engine label using a reserved namespace (com.docker.\*, io.docker.\*, or org.dockerproject.\*) is configured, as per [Docker object labels](../../config/labels-custom-metadata.md). [moby/moby#36921](https://github.com/moby/moby/pull/36921) - Fix missing plugin name in message. [moby/moby#37052](https://github.com/moby/moby/pull/37052) - Fix link anchors in CONTRIBUTING.md. [moby/moby#37276](https://github.com/moby/moby/pull/37276) - Fix link to Docker Toolbox. [moby/moby#37240](https://github.com/moby/moby/pull/37240) diff --git a/engine/release-notes/18.09.md b/engine/release-notes/18.09.md index e7fe74c6bd..9f41bde9ec 100644 --- a/engine/release-notes/18.09.md +++ b/engine/release-notes/18.09.md @@ -375,9 +375,9 @@ Update your configuration if this command prints a non-empty value for `MountFla - Docker has deprecated support for Device Mapper as a storage driver. It will continue to be supported at this time, but support will be removed in a future release. - The [Overlay2 storage driver](https://docs.docker.com/storage/storagedriver/overlayfs-driver/) is now the default for Docker engine implementations. + The [Overlay2 storage driver](../../storage/storagedriver/overlayfs-driver.md) is now the default for Docker engine implementations. -For more information on the list of deprecated flags and APIs, have a look at the [deprecation information](https://docs.docker.com/engine/deprecated/) where you can find the target removal dates. +For more information on the list of deprecated flags and APIs, have a look at the [deprecation information](/engine/deprecated/) where you can find the target removal dates. ### End of Life Notification diff --git a/engine/release-notes/19.03.md b/engine/release-notes/19.03.md index 478de6a135..3cb57abcd6 100644 --- a/engine/release-notes/19.03.md +++ b/engine/release-notes/19.03.md @@ -619,7 +619,7 @@ support for v2 schema1 althogether. [moby/moby#39365](https://github.com/moby/mo * Removed support for 17.09. For more information on deprecated flags and APIs, refer to -https://docs.docker.com/engine/deprecated/ for target removal dates. +[deprecation information](/engine/deprecated/) for target removal dates. ### Known issues diff --git a/get-started/orchestration.md b/get-started/orchestration.md index a85ce7cc2e..3e44825061 100644 --- a/get-started/orchestration.md +++ b/get-started/orchestration.md @@ -329,5 +329,5 @@ Further documentation for all CLI commands used in this article are available he - [`kubectl get`](https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#get) - [`kubectl logs`](https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#logs) - [`kubectl delete`](https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#delete) -- [`docker swarm init`](https://docs.docker.com/engine/reference/commandline/swarm_init/) -- [`docker service *`](https://docs.docker.com/engine/reference/commandline/service/) +- [`docker swarm init`](/engine/reference/commandline/swarm_init/) +- [`docker service *`](/engine/reference/commandline/service/) diff --git a/get-started/swarm-deploy.md b/get-started/swarm-deploy.md index e4d5f48cca..7cf1de4a98 100644 --- a/get-started/swarm-deploy.md +++ b/get-started/swarm-deploy.md @@ -90,8 +90,8 @@ In addition to deploying to Swarm, we have also described our application as a s Further documentation for all new Swarm objects and CLI commands used in this article are available here: - - [Swarm Mode](https://docs.docker.com/engine/swarm/) - - [Swarm Mode Services](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/) - - [Swarm Stacks](https://docs.docker.com/engine/swarm/stack-deploy/) - - [`docker stack *`](https://docs.docker.com/engine/reference/commandline/stack/) - - [`docker service *`](https://docs.docker.com/engine/reference/commandline/service/) + - [Swarm Mode](../engine/swarm/index.md) + - [Swarm Mode Services](../engine/swarm/how-swarm-mode-works/services.md) + - [Swarm Stacks](../engine/swarm/stack-deploy.md) + - [`docker stack *`](/engine/reference/commandline/stack/) + - [`docker service *`](/engine/reference/commandline/service/) diff --git a/language/golang/build-images.md b/language/golang/build-images.md index c095147327..3b5aa9223c 100644 --- a/language/golang/build-images.md +++ b/language/golang/build-images.md @@ -26,7 +26,7 @@ file system objects required. To complete this tutorial, you need the following: - Go version 1.16 or later. You might want to [download and install Go](https://golang.org/dl/) first. -- Docker running locally. Follow the instructions to [download and install Docker](https://docs.docker.com/desktop/). +- Docker running locally. Follow the instructions to [download and install Docker](../../desktop/index.md). - An IDE or a text editor to edit files. We recommend using [Visual Studio Code](https://code.visualstudio.com/){: target="_blank" rel="noopener" class="_"}. ## Meet the example application @@ -153,7 +153,7 @@ When we have used that `FROM` command, we told Docker to include in our image al > **Note** > -> If you want to learn more about creating your own base images, see [creating base images](https://docs.docker.com/develop/develop-images/baseimages/) section of the guide. +> If you want to learn more about creating your own base images, see [creating base images](../../develop/develop-images/baseimages.md) section of the guide. To make things easier when running the rest of our commands, let’s create a directory _inside_ the image that we are building. This also instructs Docker diff --git a/language/python/build-images.md b/language/python/build-images.md index a6780337bd..d74007a815 100644 --- a/language/python/build-images.md +++ b/language/python/build-images.md @@ -79,7 +79,7 @@ Docker images can be inherited from other images. Therefore, instead of creating > **Note** > -> To learn more about creating your own base images, see [Creating base images](https://docs.docker.com/develop/develop-images/baseimages/). +> To learn more about creating your own base images, see [Creating base images](../../develop/develop-images/baseimages.md). To make things easier when running the rest of our commands, let’s create a working directory. This instructs Docker to use this path as the default location for all subsequent commands. By doing this, we do not have to type out full file paths but can use relative paths based on the working directory. diff --git a/network/network-tutorial-overlay.md b/network/network-tutorial-overlay.md index 8fb9ae0675..4f4dba9cdf 100644 --- a/network/network-tutorial-overlay.md +++ b/network/network-tutorial-overlay.md @@ -395,7 +395,7 @@ example also uses Linux hosts, but the same commands work on Windows. The two containers communicate with the overlay network connecting the two hosts. If you run another alpine container on `host2` that is _not detached_, you can ping `alpine1` from `host2` (and here we add the - [remove option](https://docs.docker.com/engine/reference/run/#clean-up---rm) for automatic container cleanup): + [remove option](/engine/reference/run/#clean-up---rm) for automatic container cleanup): ```sh $ docker run -it --rm --name alpine3 --network test-net alpine diff --git a/opensource/index.md b/opensource/index.md index 9205200578..54798c79de 100644 --- a/opensource/index.md +++ b/opensource/index.md @@ -61,8 +61,8 @@ repository. We've made it really easy for you to file new issues. - Click **New issue** on the docs repository and fill in the details, or -- Click **Request docs changes** in the right column of every page on - docs.docker.com and add the details. +- Click **Request docs changes** in the right column of every page + and add the details. ![Docs feedback on each page](/opensource/images/docs-site-feedback.png) diff --git a/robots.txt b/robots.txt index 9decfe1b83..83212e8fb1 100644 --- a/robots.txt +++ b/robots.txt @@ -29,7 +29,7 @@ Disallow: /ee/ Disallow: /apidocs/v* -Sitemap: https://docs.docker.com/sitemap.xml +Sitemap: {{ site.docs_url }}/sitemap.xml {%- else -%} # Disable all indexing on staging websites and Netlify previews to prevent # them showing up in search results.