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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ in Docker Hub. For example, run the following to access `v1.9`:

All the images described below are automatically built using Docker Hub. To
build the site manually, from scratch, including all utility and archive images,
see the [README in the publish-tools
branch](https://github.com/docker/docker.github.io/blob/publish-tools/README.md).
see the [README in the publish-tools branch](https://github.com/docker/docker.github.io/blob/publish-tools/README.md).

- Some utility images are built from Dockerfiles in the `publish-tools` branch.
See its [README](https://github.com/docker/docker.github.io/blob/publish-tools/README.md)
Expand Down
5 changes: 2 additions & 3 deletions _includes/content/moby.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ relationship of Docker to Moby at [mobyproject.org](https://mobyproject.org/).

The Moby project lives [here](https://github.com/moby/moby).

See [Contribute to the Moby
project](https://github.com/moby/moby/blob/master/CONTRIBUTING.md) to learn how
to help work on the codebase.
See [Contribute to the Moby project](https://github.com/moby/moby/blob/master/CONTRIBUTING.md)
to learn how to help work on the codebase.
10 changes: 5 additions & 5 deletions compose/aspnet-mssql-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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](/install/index.md)
and [Docker Compose](/compose/install/) installed on your
and [Docker Compose](/compose/install.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 All @@ -25,8 +25,8 @@ configure this app to use our SQL Server database, and then create a
1. Create a new directory for your application.

This directory is the context of your docker-compose project. For
[Docker Desktop for Windows](/docker-for-windows/#/shared-drives) and
[Docker Desktop for Mac](/docker-for-mac/#/file-sharing), you
[Docker Desktop for Windows](/docker-for-windows/index.md#file-sharing) and
[Docker Desktop for Mac](/docker-for-mac/index.md#file-sharing), you
need to set up file sharing for the volume that you need to map.

1. Within your directory, use the `dotnet:2.1-sdk` Docker image to generate a
Expand Down Expand Up @@ -173,8 +173,8 @@ configure this app to use our SQL Server database, and then create a

1. Make sure you allocate at least 2GB of memory to Docker Engine. Here is how
to do it on
[Docker Desktop for Mac](/docker-for-mac/#/advanced) and
[Docker Desktop for Windows](/docker-for-windows/#/advanced).
[Docker Desktop for Mac](/docker-for-mac/index.md#advanced) and
[Docker Desktop for Windows](/docker-for-windows/index.md#advanced).
This is necessary to run the SQL Server on Linux container.

1. Run the `docker-compose up` command. After a few seconds, you should be able
Expand Down
4 changes: 2 additions & 2 deletions compose/completion.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,5 @@ Enjoy working with Compose faster and with fewer typos!
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
- [Command line reference](./reference/index.md)
- [Compose file reference](compose-file.md)
- [Command line reference](/compose/reference/index.md)
- [Compose file reference](/compose/compose-file/index.md)
34 changes: 17 additions & 17 deletions compose/compose-file/compose-file-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ options and tags it with the specified tag.

### labels

Add metadata to containers using [Docker labels](/engine/userguide/labels-custom-metadata.md). You can use either an array or a dictionary.
Add metadata to containers using [Docker labels](/config/labels-custom-metadata.md). You can use either an array or a dictionary.

It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.

Expand All @@ -420,7 +420,7 @@ Link to containers in another service. Either specify both the service name and
a link alias (`"SERVICE:ALIAS"`), or just the service name.

> Links are a legacy option. We recommend using
> [networks](#networks) instead.
> [networks](/compose/networking.md) instead.

```yaml
web:
Expand All @@ -434,18 +434,18 @@ Containers for the linked service are reachable at a hostname identical to
the alias, or the service name if no alias was specified.

Links also express dependency between services in the same way as
[depends_on](#depends_on), so they determine the order of service startup.
[depends_on](compose-file-v2.md#depends_on), so they determine the order of service startup.

> **Note**
>
> If you define both links and [networks](#networks), services with
> If you define both links and [networks](index.md#networks), services with
> links between them must share at least one network in common in order to
> communicate.

### log_driver

> [Version 1 file format](compose-versioning#version-1) only. In version 2 and up, use
> [logging](/compose/compose-file/index.md#logging).
> [Version 1 file format](compose-versioning.md#version-1) only. In version 2 and up, use
> [logging](index.md#logging).

Specify a log driver. The default is `json-file`.

Expand All @@ -455,8 +455,8 @@ log_driver: syslog

### log_opt

> [Version 1 file format](compose-versioning#version-1) only. In version 2 and up, use
> [logging](/compose/compose-file/index.md#logging).
> [Version 1 file format](compose-versioning.md#version-1) only. In version 2 and up, use
> [logging](index.md#logging).

Specify logging options as key-value pairs. An example of `syslog` options:

Expand All @@ -468,7 +468,7 @@ log_opt:
### net

> [Version 1 file format](compose-versioning.md#version-1) only. In version 2 and up, use
> [network_mode](/compose/compose-file/index.md#networkmode) and [networks](/compose/compose-file/index.md#networks).
> [network_mode](index.md#network_mode) and [networks](index.md#networks).

Network mode. Use the same values as the docker client `--net` parameter.
The `container:...` form can take a service name instead of a container name or
Expand Down Expand Up @@ -561,9 +561,9 @@ ulimits:

Mount paths or named volumes, optionally specifying a path on the host machine
(`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
For [version 2 files](compose-versioning#version-2), named volumes need to be specified with the
For [version 2 files](compose-versioning.md#version-2), named volumes need to be specified with the
[top-level `volumes` key](compose-file-v2.md#volume-configuration-reference).
When using [version 1](compose-versioning#version-1), the Docker Engine creates the named
When using [version 1](compose-versioning.md#version-1), the Docker Engine creates the named
volume automatically if it doesn't exist.

You can mount a relative path on the host, which expands relative to
Expand Down Expand Up @@ -595,16 +595,16 @@ volume_driver: mydriver
```

There are several things to note, depending on which
[Compose file version](compose-versioning#versioning) you're using:
[Compose file version](compose-versioning.md#versioning) you're using:

- For [version 1 files](compose-versioning#version-1), both named volumes and
- For [version 1 files](compose-versioning.md#version-1), both named volumes and
container volumes use the specified driver.
- No path expansion is done if you have also specified a `volume_driver`.
For example, if you specify a mapping of `./foo:/data`, the `./foo` part
is passed straight to the volume driver without being expanded.

See [Docker Volumes](/engine/userguide/dockervolumes.md) and
[Volume Plugins](/engine/extend/plugins_volume.md) for more information.
See [Docker Volumes](/storage/volumes.md) and
[Volume Plugins](/engine/extend/plugins_volume/) for more information.

### volumes_from

Expand Down Expand Up @@ -653,5 +653,5 @@ tty: true
- [User guide](/compose/index.md)
- [Installing Compose](/compose/install.md)
- [Compose file versions and upgrading](compose-versioning.md)
- [Samples](/samples/)
- [Command line reference](/compose/reference/)
- [Samples](/samples/index.md)
- [Command line reference](/compose/reference/index.md)
36 changes: 18 additions & 18 deletions compose/compose-file/compose-file-v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ build:
> In your Dockerfile, if you specify `ARG` before the `FROM` instruction,
> `ARG` is not available in the build instructions under `FROM`.
> If you need an argument to be available in both places, also specify it under
> the `FROM` instruction. Refer to the [understand how ARGS and FROM interact](/engine/reference/builder/#understand-how-arg-and-from-interact)
> the `FROM` instruction. Refer to the [understand how ARGS and FROM interact](/engine/reference/builder.md#understand-how-arg-and-from-interact)
> section in the documentation for usage details.

You can omit the value when specifying a build argument, in which case its value
Expand Down Expand Up @@ -281,7 +281,7 @@ to determine the value to use for builds.

> Added in [version 2.1](compose-versioning.md#version-21) file format

Add metadata to the resulting image using [Docker labels](/engine/userguide/labels-custom-metadata.md).
Add metadata to the resulting image using [Docker labels](/config/labels-custom-metadata.md).
You can use either an array or a dictionary.

It's recommended that you use reverse-DNS notation to prevent your labels from
Expand Down Expand Up @@ -349,7 +349,7 @@ build:
> Added in [version 2.3](compose-versioning.md#version-23) file format

Build the specified stage as defined inside the `Dockerfile`. See the
[multi-stage build docs](/engine/userguide/eng-image/multistage-build.md) for
[multi-stage build docs](/develop/develop-images/multistage-build.md) for
details.

```yaml
Expand Down Expand Up @@ -740,7 +740,7 @@ external_links:
>
> If you're using the [version 2 or above file format](compose-versioning.md#version-2),
> the externally-created containers must be connected to at least one of the same
> networks as the service that is linking to them. [Links](compose-file-v2#links)
> networks as the service that is linking to them. [Links](compose-file-v2.md#links)
> are a legacy option. We recommend using [networks](#networks) instead.

### extra_hosts
Expand Down Expand Up @@ -881,7 +881,7 @@ services:
> The default init binary that is used is [Tini](https://github.com/krallin/tini),
> and is installed in `/usr/libexec/docker-init` on the daemon host. You can
> configure the daemon to use a custom init binary through the
> [`init-path` configuration option](/engine/reference/commandline/dockerd/#daemon-configuration-file).
> [`init-path` configuration option](/engine/reference/commandline/dockerd.md#daemon-configuration-file).

### isolation

Expand All @@ -895,7 +895,7 @@ for details.

### labels

Add metadata to containers using [Docker labels](/engine/userguide/labels-custom-metadata.md). You can use either an array or a dictionary.
Add metadata to containers using [Docker labels](/config/labels-custom-metadata.md). You can use either an array or a dictionary.

It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.

Expand Down Expand Up @@ -958,7 +958,7 @@ logging:

The `driver` name specifies a logging driver for the service's
containers, as with the ``--log-driver`` option for docker run
([documented here](/engine/admin/logging/overview.md)).
([documented here](/config/containers/logging/configure.md)).

The default value is json-file.

Expand Down Expand Up @@ -1311,7 +1311,7 @@ security_opt:

Specify how long to wait when attempting to stop a container if it doesn't
handle SIGTERM (or whatever stop signal has been specified with
[`stop_signal`](#stopsignal)), before sending SIGKILL. Specified
[`stop_signal`](#stop_signal)), before sending SIGKILL. Specified
as a [duration](#specifying-durations).

```yaml
Expand Down Expand Up @@ -1401,7 +1401,7 @@ userns_mode: "host"
```

Disables the user namespace for this service, if Docker daemon is configured with user namespaces.
See [dockerd](/engine/reference/commandline/dockerd.md#disable-user-namespace-for-a-container) for
See [dockerd](/engine/reference/commandline/dockerd/#disable-user-namespace-for-a-container) for
more information.

### volumes
Expand Down Expand Up @@ -1489,7 +1489,7 @@ volumes:
> When creating bind mounts, using the long syntax requires the
> referenced folder to be created beforehand. Using the short syntax
> creates the folder on the fly if it doesn't exist.
> See the [bind mounts documentation](/engine/admin/volumes/bind-mounts.md/#differences-between--v-and---mount-behavior)
> See the [bind mounts documentation](/storage/bind-mounts.md#differences-between--v-and---mount-behavior)
> for more information.

### volume\_driver
Expand All @@ -1510,8 +1510,8 @@ volume_driver: mydriver
> entry in the [top-level `volumes` option](#volume-configuration-reference).


See [Docker Volumes](/engine/userguide/dockervolumes.md) and
[Volume Plugins](/engine/extend/plugins_volume.md) for more information.
See [Docker Volumes](/storage/volumes.md) and
[Volume Plugins](/engine/extend/plugins_volume/) for more information.

### volumes_from

Expand Down Expand Up @@ -1641,8 +1641,8 @@ easily retrieved and inspected using the docker command line or API.
See the [docker volume](/engine/reference/commandline/volume_create.md)
subcommand documentation for more information.

See [use volumes](/engine/admin/volumes/volumes.md) and [volume
plugins](/engine/extend/plugins_volume.md) for general information on volumes.
See [use volumes](/storage/volumes.md) and [volume plugins](/engine/extend/plugins_volume/)
for general information on volumes.

Here's an example of a two-service setup where a database's data directory is
shared with another service as a volume so that it can be periodically backed
Expand Down Expand Up @@ -1744,7 +1744,7 @@ volumes:
> Added in [version 2.1](compose-versioning.md#version-21) file format.

Add metadata to containers using
[Docker labels](/engine/userguide/labels-custom-metadata.md). You can use either
[Docker labels](/config/labels-custom-metadata.md). You can use either
an array or a dictionary.

It's recommended that you use reverse-DNS notation to prevent your labels from
Expand Down Expand Up @@ -1877,7 +1877,7 @@ you can set this option to `true`.
> Added in [version 2.1](compose-versioning.md#version-21) file format.

Add metadata to containers using
[Docker labels](/engine/userguide/labels-custom-metadata.md). You can use either
[Docker labels](/config/labels-custom-metadata.md). You can use either
an array or a dictionary.

It's recommended that you use reverse-DNS notation to prevent your labels from
Expand Down Expand Up @@ -1986,5 +1986,5 @@ networks:
- [User guide](/compose/index.md)
- [Installing Compose](/compose/install.md)
- [Compose file versions and upgrading](compose-versioning.md)
- [Samples](/samples/)
- [Command line reference](/compose/reference/)
- [Samples](/samples/index.md)
- [Command line reference](/compose/reference/index.md)
Loading