Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENGDOCS-1874 #18786

Merged
merged 6 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions content/cloud/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
title: Cloud integrations
description: ACI and ECS integration information
keywords: compose, ACI, ECS, amazon, cloud integration
aliases:
- /engine/context/aci-integration/
- /cloud/aci-integration/
- /cloud/ecs-integration/
- /cloud/ecs-compose-examples/
- /cloud/ecs-compose-features/
- /cloud/ecs-architecture/
- /cloud/aci-compose-features/
- /cloud/aci-container-features/
---

Docker Compose's integration for Amazon's Elastic Container Service and Azure Container Instances has retired. The integration documentation is no longer available through the Docker Docs site.

However, you can still access the relevant documentation in the [Compose CLI repository](https://github.com/docker/compose-cli/tree/main/docs).

475 changes: 0 additions & 475 deletions content/cloud/aci-integration.md

This file was deleted.

628 changes: 0 additions & 628 deletions content/cloud/ecs-integration.md

This file was deleted.

5 changes: 2 additions & 3 deletions content/desktop/faqs/general.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ This includes:
- Setting up [Dev Environments](../dev-environments/index.md)
- Docker build when using [BuildKit](../../build/buildkit/index.md#getting-started).
You can work around this by disabling BuildKit. Run `DOCKER_BUILDKIT=0 docker build .` to disable BuildKit.
- Deploying an app to the cloud through Compose
[ACI](../../cloud/aci-integration.md) and [ECS](../../cloud/ecs-integration.md)
integrations
- Deploying an app to the cloud through the Docker Compose
[ACI and ECS](https://github.com/docker/compose-cli/tree/main/docs) integrations
- [Kubernetes](../kubernetes.md) (Images are download when you enable Kubernetes for the first time)
- Check for updates
- [In-app diagnostics](../troubleshoot/overview.md#diagnose-from-the-app) (including the [Self-diagnose tool](../troubleshoot/overview.md#diagnose-from-the-app))
Expand Down
3 changes: 1 addition & 2 deletions content/desktop/previous-versions/2.x-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,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](/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](/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.
### Upgrades

- [Docker Compose 1.27.2](https://github.com/docker/compose/releases/tag/1.27.2)
Expand Down
2 changes: 1 addition & 1 deletion content/desktop/previous-versions/2.x-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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](/engine/context/ecs-integration/) and [Deploying Docker containers on Azure](/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.

### Upgrades

Expand Down
4 changes: 2 additions & 2 deletions content/desktop/previous-versions/edge-releases-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
### New

- In partnership with Snyk, Docker Desktop launches vulnerability scanning for Docker local images.
- Docker ECS plugin has been replaced by [ECS cloud integration](/engine/context/ecs-integration/)
- Docker ECS plugin has been replaced by ECS cloud 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.
Expand Down Expand Up @@ -249,7 +249,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](/engine/context/ecs-integration/)
- Beta release of Docker ECS integration v1.0.0-beta.1
- [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)

Expand Down
4 changes: 2 additions & 2 deletions content/desktop/previous-versions/edge-releases-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
### New

- In partnership with Snyk, Docker Desktop launches vulnerability scanning for Docker local images.
- Docker ECS plugin has been replaced by [ECS cloud integration](/engine/context/ecs-integration/)
- Docker ECS plugin has been replaced by ECS cloud 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.
Expand Down Expand Up @@ -258,7 +258,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.](/engine/context/ecs-integration/)
- Beta release of Docker ECS integration v1.0.0-beta.1.
- [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)

Expand Down
18 changes: 2 additions & 16 deletions data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,22 +185,8 @@ Guides:
path: /get-started/kube-deploy/
- title: "Deploy to Swarm"
path: /get-started/swarm-deploy/
- sectiontitle: Cloud integrations
section:
- path: /cloud/aci-integration/
title: Docker and ACI
- path: /cloud/aci-container-features/
title: ACI container features
- path: /cloud/aci-compose-features/
title: ACI Compose features
- path: /cloud/ecs-integration/
title: Docker and ECS
- path: /cloud/ecs-architecture/
title: Docker ECS integration architecture
- path: /cloud/ecs-compose-features/
title: ECS Compose features
- path: /cloud/ecs-compose-examples/
title: ECS Compose examples
- title: Cloud integrations
path: /cloud/
- path: /get-started/resources/
title: "Educational resources"

Expand Down
13 changes: 0 additions & 13 deletions hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -279,19 +279,6 @@ module:
- source: docs/reference/commandline/dockerd.md
target: content/engine/reference/commandline/dockerd.md

- path: github.com/docker/compose-cli
mounts:
- source: docs/aci-compose-features.md
target: content/cloud/aci-compose-features.md
- source: docs/aci-container-features.md
target: content/cloud/aci-container-features.md
- source: docs/ecs-architecture.md
target: content/cloud/ecs-architecture.md
- source: docs/ecs-compose-examples.md
target: content/cloud/ecs-compose-examples.md
- source: docs/ecs-compose-features.md
target: content/cloud/ecs-compose-features.md

- path: github.com/compose-spec/compose-spec
mounts:
- source: 01-status.md
Expand Down