Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion compose/completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Enjoy working with Compose faster and with fewer typos!
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
- [Sample apps with Compose](samples-for-compose.md)
2 changes: 1 addition & 1 deletion compose/compose-file/compose-file-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,7 @@ networks:
## Compose documentation

- [User guide](../index.md)
- [Installing Compose](../install.md)
- [Installing Compose](../install/index.md)
- [Compose file versions and upgrading](compose-versioning.md)
- [Sample apps with Compose](../samples-for-compose.md)
- [Command line reference](../reference/index.md)
2 changes: 1 addition & 1 deletion compose/compose-file/compose-file-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,7 @@ stack.
## Compose documentation

- [User guide](../index.md)
- [Installing Compose](../install.md)
- [Installing Compose](../install/index.md)
- [Compose file versions and upgrading](compose-versioning.md)
- [Sample apps with Compose](../samples-for-compose.md)
- [Command line reference](../reference/index.md)
2 changes: 1 addition & 1 deletion compose/compose-file/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2501,7 +2501,7 @@ for complex elements, interpolation MUST be applied _before_ merge on a per-file
## Compose documentation

- [User guide](../index.md)
- [Installing Compose](../install.md)
- [Installing Compose](../install/index.md)
- [Compose file versions and upgrading](compose-versioning.md)
- [Sample apps with Compose](../samples-for-compose.md)
- [Enabling GPU access with Compose](../gpu-support.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/env-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ in your Compose file, and can also be used to define the following
## More Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/extends.md
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ services:
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ GitHub](https://github.com/search?q=in%3Apath+docker-compose.yml+extension%3Ayml
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/gettingstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ understandable even if you're not familiar with it.
## Prerequisites

Make sure you have already installed both [Docker Engine](../get-docker.md)
and [Docker Compose](install.md). You don't need to install Python or Redis, as
and [Docker Compose](install/index.md). You don't need to install Python or Redis, as
both are provided by Docker images.

## Step 1: Setup
Expand Down
2 changes: 1 addition & 1 deletion compose/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Compose has commands for managing the whole lifecycle of your application:

If you rely on using Docker Compose as `docker-compose` (with a hyphen), you can
set up Compose V2 to act as a drop-in replacement of the previous `docker-compose`.
Refer to the [Installing Compose](install.md) section for detailed instructions.
Refer to the [Installing Compose](install/index.md) section for detailed instructions.

## Context of Docker Compose evolution

Expand Down
12 changes: 6 additions & 6 deletions compose/install/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ You can run Compose on macOS, Windows, and 64-bit Linux. Check what installation
Are you looking to:

* __Get latest Compose and its prerequisites right of the bat__:
[Install Docker Desktop for your platform](./compose-desktop.md). This is the fastest route and you get Docker Engine and Docker CLI with the Compose plugin. Docker Desktop is available for Mac, Windows and Linux.
[Install Docker Desktop for your platform](compose-desktop.md). This is the fastest route and you get Docker Engine and Docker CLI with the Compose plugin. Docker Desktop is available for Mac, Windows and Linux.

* __Install Compose plug in:__
+ __(Mac, Win, Linux) Docker Desktop__: If you have Desktop installed then you already have the Compose plugin installed.
+ __Linux systems__: To install the Docker CLI's Compose plugin,s use one of these methods of installation:
+ Using the [convenience scripts](../../../engine/install/#server){: target="_blank" rel="noopener" class="_"} offered per Linux distro from the Engine install section.
+ Using the [convenience scripts](../../engine/install/index.md#server){: target="_blank" rel="noopener" class="_"} offered per Linux distro from the Engine install section.
+ [Setting up Docker's repository](compose-plugin#install-using-the-repository) and using it to install the compose plugin package.
+ Other scenarios, check the [Linux install](compose-plugin#installing-compose-on-linux-systems).
+ __Windows Server__: If you want to run the Docker daemon and client directly on Microsoft Windows Server, follow the [Windows Server install instructions](compose-plugin#install-compose-on-windows-server).
Expand All @@ -32,7 +32,7 @@ Are you looking to:
## Where to go next

- [User guide](index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
- [Sample apps with Compose](samples-for-compose.md)
- [Getting Started](../gettingstarted.md)
- [Command line reference](../reference/index.md)
- [Compose file reference](../compose-file/index.md)
- [Sample apps with Compose](../samples-for-compose.md)
2 changes: 1 addition & 1 deletion compose/production.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ commands work with no further configuration.
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/profiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ $ COMPOSE_PROFILES=dev docker-compose up phpmyadmin
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion compose/reference/envvars.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ python client.
## Related information

- [User guide](../index.md)
- [Installing Compose](../install.md)
- [Installing Compose](../install/index.md)
- [Compose file reference](../compose-file/index.md)
- [Environment file](../env-file.md)
2 changes: 1 addition & 1 deletion compose/samples-for-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: Sample apps with Compose
---

The following samples show the various aspects of how to work with Docker
Compose. As a prerequisite, be sure to [install Docker Compose](install.md)
Compose. As a prerequisite, be sure to [install Docker Compose](install/index.md)
if you have not already done so.

## Key concepts these samples cover
Expand Down
2 changes: 1 addition & 1 deletion compose/startup-order.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ script:
## Compose documentation

- [User guide](index.md)
- [Installing Compose](install.md)
- [Installing Compose](install/index.md)
- [Getting Started](gettingstarted.md)
- [Command line reference](reference/index.md)
- [Compose file reference](compose-file/index.md)
Expand Down
2 changes: 1 addition & 1 deletion engine/security/trust/deploying_notary.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords: trust, security, notary, deployment
title: Deploy Notary Server with Compose
---

The easiest way to deploy Notary Server is by using Docker Compose. To follow the procedure on this page, you must have already [installed Docker Compose](../../../compose/install.md).
The easiest way to deploy Notary Server is by using Docker Compose. To follow the procedure on this page, you must have already [installed Docker Compose](../../../compose/install/index.md).

1. Clone the Notary repository.

Expand Down
2 changes: 1 addition & 1 deletion engine/security/trust/trust_sandbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This sandbox requires you to install two Docker tools: Docker Engine >= 1.10.0
and Docker Compose >= 1.6.0. To install the Docker Engine, choose from the
[list of supported platforms](../../install/index.md). To install
Docker Compose, see the
[detailed instructions here](../../../compose/install.md).
[detailed instructions here](../../../compose/install/index.md).

## What is in the sandbox?

Expand Down
2 changes: 1 addition & 1 deletion engine/swarm/stack-deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To run through this tutorial, you need:
> `docker stack` and `docker service` commands must be run from a manager
> node.

2. A current version of [Docker Compose](../../compose/install.md).
2. A current version of [Docker Compose](../../compose/install/index.md).


## Set up a Docker registry
Expand Down
2 changes: 1 addition & 1 deletion get-started/08_using_compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ So, how do we get started?

If you installed Docker Desktop/Toolbox for either Windows or Mac, you already have Docker Compose!
Play-with-Docker instances already have Docker Compose installed as well. If you are on
a Linux machine, you will need to [install Docker Compose](../compose/install.md).
a Linux machine, you will need to [install Docker Compose](../compose/install/index.md).

After installation, you should be able to run the following and see version information.

Expand Down
4 changes: 2 additions & 2 deletions samples/aspnet-mssql-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Compose to set up and run the sample ASP.NET Core application using the
with the
[SQL Server on Linux image](https://hub.docker.com/_/microsoft-mssql-server).
You just need to have [Docker Engine](../get-docker.md)
and [Docker Compose](../compose/install.md) installed on your
and [Docker Compose](../compose/install/index.md) installed on your
platform of choice: Linux, Mac or Windows.

For this sample, we create a sample .NET Core Web Application using the
Expand Down Expand Up @@ -208,7 +208,7 @@ to try out .NET Framework and more SQL Server tutorials.
## More Compose documentation

- [Docker Compose overview](../compose/index.md)
- [Install Docker Compose](../compose/install.md)
- [Install Docker Compose](../compose/install/index.md)
- [Getting Started with Docker Compose](../compose/gettingstarted.md)
- [Docker Compose Command line reference](../compose/reference/index.md)
- [Compose file reference](../compose/compose-file/index.md)
Expand Down
4 changes: 2 additions & 2 deletions samples/django.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ redirect_from:
---

This quick-start guide demonstrates how to use Docker Compose to set up and run a simple Django/PostgreSQL app. Before starting,
[install Compose](../compose/install.md).
[install Compose](../compose/install/index.md).

### Define the project components

Expand Down Expand Up @@ -286,7 +286,7 @@ In this section, you set up the database connection for Django.
## More Compose documentation

- [Docker Compose overview](../compose/index.md)
- [Install Docker Compose](../compose/install.md)
- [Install Docker Compose](../compose/install/index.md)
- [Getting Started with Docker Compose](../compose/gettingstarted.md)
- [Docker Compose Command line reference](../compose/reference/index.md)
- [Compose file reference](../compose/compose-file/index.md)
Expand Down
4 changes: 2 additions & 2 deletions samples/rails.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ redirect_from:
---

This Quickstart guide shows you how to use Docker Compose to set up and run
a Rails/PostgreSQL app. Before starting, [install Compose](../compose/install.md).
a Rails/PostgreSQL app. Before starting, [install Compose](../compose/install/index.md).

### Define the project

Expand Down Expand Up @@ -272,7 +272,7 @@ host.
## More Compose documentation

- [Docker Compose overview](../compose/index.md)
- [Install Docker Compose](../compose/install.md)
- [Install Docker Compose](../compose/install/index.md)
- [Getting Started with Docker Compose](../compose/gettingstarted.md)
- [Docker Compose Command line reference](../compose/reference/index.md)
- [Compose file reference](../compose/compose-file/index.md)
Expand Down
4 changes: 2 additions & 2 deletions samples/wordpress.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ redirect_from:
You can use Docker Compose to easily run WordPress in an isolated environment
built with Docker containers. This quick-start guide demonstrates how to use
Compose to set up and run WordPress. Before starting, make sure you have
[Compose installed](../compose/install.md).
[Compose installed](../compose/install/index.md).

### Define the project

Expand Down Expand Up @@ -144,7 +144,7 @@ network, and the WordPress database.
## More Compose documentation

- [Docker Compose overview](../compose/index.md)
- [Install Docker Compose](../compose/install.md)
- [Install Docker Compose](../compose/install/index.md)
- [Getting Started with Docker Compose](../compose/gettingstarted.md)
- [Docker Compose Command line reference](../compose/reference/index.md)
- [Compose file reference](../compose/compose-file/index.md)
Expand Down