Skip to content

Commit 5fe707a

Browse files
authored
compose-callouts (#21039)
* compose-callouts * reorder
1 parent 953a638 commit 5fe707a

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

content/manuals/compose/how-tos/environment-variables/envvars.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,30 +159,26 @@ If `COMPOSE_ENV_FILES` is not set, and you don't provide `--env-file` in the CLI
159159

160160
### COMPOSE\_MENU
161161

162+
> Available in Docker Compose version [2.26.0](/manuals/compose/releases/release-notes.md#2260) and later, and Docker Desktop version 4.29 and later.
163+
162164
When enabled, Compose displays a navigation menu where you can choose to open the Compose stack in Docker Desktop, switch on [`watch` mode](../file-watch.md), or use [Docker Debug](/reference/cli/docker/debug.md).
163165

164166
* Supported values:
165167
* `true` or `1`, to enable,
166168
* `false` or `0`, to disable.
167169
* Defaults to: `1` if you obtained Docker Compose through Docker Desktop, otherwise default is `0`.
168170

169-
> [!NOTE]
170-
>
171-
> Available in Docker Compose version 2.26.0 and later, and Docker Desktop version 4.29 and later
172-
173171
### COMPOSE\_EXPERIMENTAL
174172

173+
> Available in Docker Compose version [2.26.0](/manuals/compose/releases/release-notes.md#2260) and later, and Docker Desktop version 4.29 and later.
174+
175175
This is an opt-out variable. When turned off it deactivates the experimental features such as the navigation menu or [Synchronized file shares](/manuals/desktop/synchronized-file-sharing.md).
176176

177177
* Supported values:
178178
* `true` or `1`, to enable,
179179
* `false` or `0`, to disable.
180180
* Defaults to: `1`.
181181

182-
> [!NOTE]
183-
>
184-
> Available in Docker Compose version 2.26.0 and later, and Docker Desktop version 4.29 and later
185-
186182
## Unsupported in Compose V2
187183

188184
The following environment variables have no effect in Compose V2.

content/manuals/compose/how-tos/environment-variables/set-environment-variables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ aliases:
1212

1313
A container's environment is not set until there's an explicit entry in the service configuration to make this happen. With Compose, there are two ways you can set environment variables in your containers with your Compose file.
1414

15-
>**Tip**
15+
>[!TIP]
1616
>
1717
> Don't use environment variables to pass sensitive information, such as passwords, in to your containers. Use [secrets](../use-secrets.md) instead.
1818

content/manuals/compose/how-tos/file-watch.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ If `action` is set to `sync+restart`, Compose synchronizes your changes with the
9898
`sync+restart` is ideal when config file changes, and you don't need to rebuild the image but just restart the main process of the service containers.
9999
It will work well when you update a database configuration or your `nginx.conf` file for example
100100

101-
>**Tip**
101+
>[!TIP]
102102
>
103103
> Optimize your `Dockerfile` for speedy
104104
incremental rebuilds with [image layer caching](/build/cache)
@@ -189,12 +189,12 @@ This setup demonstrates how to use the `sync+restart` action in Docker Compose t
189189

190190
{{< include "compose/configure-watch.md" >}}
191191

192-
> [!TIP]
192+
> [!NOTE]
193193
>
194194
> Watch can also be used with the dedicated `docker compose watch` command if you don't want to
195195
> get the application logs mixed with the (re)build logs and filesystem sync events.
196196

197-
> **Looking for a sample project to test things out?**
197+
> [!TIP]
198198
>
199199
> Check out [`dockersamples/avatars`](https://github.com/dockersamples/avatars),
200200
> or [local setup for Docker docs](https://github.com/docker/docs/blob/main/CONTRIBUTING.md)

content/manuals/compose/how-tos/multiple-compose-files/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description: General overview for the different ways you can work with multiple
33
files in Docker Compose
44
keywords: compose, compose file, merge, extends, include, docker compose, -f flag
55
linkTitle: Use multiple Compose files
6+
title: Use multiple Compose files
67
weight: 80
78
aliases:
89
- /compose/multiple-compose-files/

content/manuals/compose/install/standalone.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ On this page you can find instructions on how to install Compose standalone on L
99

1010
### On Linux
1111

12-
> **Compose standalone**
12+
> [!WARNING]
1313
>
1414
> Note that Compose standalone uses the `-compose` syntax instead of the current standard syntax `compose`.
1515
>For example type `docker-compose up` when using Compose standalone, instead of `docker compose up`.
@@ -48,16 +48,14 @@ on Microsoft Windows Server and want to install Docker Compose.
4848
```powershell
4949
Start-BitsTransfer -Source "https://github.com/docker/compose/releases/download/{{% param "compose_version" %}}/docker-compose-windows-x86_64.exe" -Destination $Env:ProgramFiles\Docker\docker-compose.exe
5050
```
51+
To install a different version of Compose, substitute `{{% param "compose_version" %}}` with the version of Compose you want to use.
5152
5253
> [!NOTE]
5354
>
5455
> On Windows Server 2019 you can add the Compose executable to `$Env:ProgramFiles\Docker`.
5556
Because this directory is registered in the system `PATH`, you can run the `docker-compose --version`
5657
command on the subsequent step with no additional configuration.
5758
58-
> To install a different version of Compose, substitute `{{% param "compose_version" %}}`
59-
> with the version of Compose you want to use.
60-
6159
4. Test the installation.
6260
6361
```console

content/manuals/compose/install/uninstall.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Or, if you have installed Compose for all users, run:
4646
$ rm /usr/local/lib/docker/cli-plugins/docker-compose
4747
```
4848

49-
> Got a **Permission denied** error?
49+
> [!NOTE]
5050
>
5151
> If you get a **Permission denied** error using either of the above
5252
> methods, you do not have the permissions allowing you to remove
53-
> `docker-compose`. To force the removal, prepend `sudo` to either of the above instructions and run it again.
53+
> Docker Compose. To force the removal, prepend `sudo` to either of the above instructions and run it again.
5454
5555
### Inspect the location of the Compose CLI plugin
5656

content/manuals/compose/releases/migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Additionally, a new [docker/compose-bin image on Docker Hub](https://hub.docker.
124124

125125
Yes. You can still download and install Compose V1 packages, but you won't get support from Docker if anything breaks.
126126

127-
>**Warning**
127+
>[!WARNING]
128128
>
129129
> The final Compose V1 release, version 1.29.2, was May 10, 2021. These packages haven't received any security updates since then. Use at your own risk.
130130

0 commit comments

Comments
 (0)