Skip to content

Commit

Permalink
absolute links to docs.docker.com are now relative links
Browse files Browse the repository at this point in the history
Signed-off-by: Adrien Duermael <adrien@duermael.com>
  • Loading branch information
aduermael committed Nov 2, 2016
1 parent ab8bcb7 commit 8fa5f3a
Show file tree
Hide file tree
Showing 71 changed files with 126 additions and 126 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ You have three options:
```

If you haven't got Docker Compose installed,
[follow these installation instructions](https://docs.docker.com/compose/install/).
[follow these installation instructions](/compose/install/).
The container runs in the background and incrementally rebuilds the site each
time a file changes. You can keep your browser open to http://localhost:4000/
Expand Down Expand Up @@ -150,7 +150,7 @@ directly on docs.docker.com.
## Style guide
If you have questions about how to write for Docker's documentation, please see
the [style guide](https://docs.docker.com/opensource/doc-style/). The style guide provides
the [style guide](/opensource/doc-style/). The style guide provides
guidance about grammar, syntax, formatting, styling, language, or tone. If
something isn't clear in the guide, please submit an issue to let us know or
submit a pull request to help us improve it.
Expand Down
4 changes: 2 additions & 2 deletions compose/bundles.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ Wrote bundle to vossibility-stack.dab
> you need to install an experimental build of Docker Engine to use it.
>
> If you're on Mac or Windows, download the “Beta channel” version of
> [Docker for Mac](https://docs.docker.com/docker-for-mac/) or
> [Docker for Windows](https://docs.docker.com/docker-for-windows/) to install
> [Docker for Mac](/docker-for-mac/) or
> [Docker for Windows](/docker-for-windows/) to install
> it. If you're on Linux, follow the instructions in the
> [experimental build README](https://github.com/docker/docker/blob/master/experimental/README.md).
Expand Down
16 changes: 8 additions & 8 deletions compose/compose-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Override the default command.

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/#cmd):

command: [bundle, exec, thin, -p, 3000]

Expand Down Expand Up @@ -264,7 +264,7 @@ Override the default entrypoint.

entrypoint: /code/entrypoint.sh

The entrypoint can also be a list, in a manner similar to [dockerfile](https://docs.docker.com/engine/reference/builder/#entrypoint):
The entrypoint can also be a list, in a manner similar to [dockerfile](/engine/reference/builder/#entrypoint):

entrypoint:
- php
Expand Down Expand Up @@ -413,7 +413,7 @@ options and tags it with the specified tag.
### labels

Add metadata to containers using [Docker labels](https://docs.docker.com/engine/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
Add metadata to containers using [Docker labels](/engine/userguide/labels-custom-metadata/). 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 @@ -462,7 +462,7 @@ Logging configuration for the service.

The `driver` name specifies a logging driver for the service's
containers, as with the ``--log-driver`` option for docker run
([documented here](https://docs.docker.com/engine/reference/logging/overview/)).
([documented here](/engine/reference/logging/overview/)).

The default value is json-file.

Expand Down Expand Up @@ -721,8 +721,8 @@ use the specified driver.
> Note: No path expansion will be done if you have also specified a
> `volume_driver`.
See [Docker Volumes](https://docs.docker.com/engine/userguide/dockervolumes/) and
[Volume Plugins](https://docs.docker.com/engine/extend/plugins_volume/) for more
See [Docker Volumes](/engine/userguide/dockervolumes/) and
[Volume Plugins](/engine/extend/plugins_volume/) for more
information.

### volumes_from
Expand All @@ -749,7 +749,7 @@ then read-write will be used.
### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir

Each of these is a single value, analogous to its
[docker run](https://docs.docker.com/engine/reference/run/) counterpart.
[docker run](/engine/reference/run/) counterpart.

cpu_shares: 73
cpu_quota: 50000
Expand Down Expand Up @@ -781,7 +781,7 @@ While it is possible to declare volumes on the fly as part of the service
declaration, this section allows you to create named volumes that can be
reused across multiple services (without relying on `volumes_from`), and are
easily retrieved and inspected using the docker command line or API.
See the [docker volume](https://docs.docker.com/engine/reference/commandline/volume_create/)
See the [docker volume](/engine/reference/commandline/volume_create/)
subcommand documentation for more information.

### driver
Expand Down
6 changes: 3 additions & 3 deletions compose/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ title: Networking in Compose
> **Note:** This document only applies if you're using [version 2 of the Compose file format](compose-file.md#versioning). Networking features are not supported for version 1 (legacy) Compose files.
By default Compose sets up a single
[network](https://docs.docker.com/engine/reference/commandline/network_create/) for your app. Each
[network](/engine/reference/commandline/network_create/) for your app. Each
container for a service joins the default network and is both *reachable* by
other containers on that network, and *discoverable* by them at a hostname
identical to the container name.
Expand Down Expand Up @@ -77,11 +77,11 @@ See the [links reference](compose-file.md#links) for more information.

When [deploying a Compose application to a Swarm cluster](swarm.md), you can make use of the built-in `overlay` driver to enable multi-host communication between containers with no changes to your Compose file or application code.

Consult the [Getting started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.
Consult the [Getting started with multi-host networking](/engine/userguide/networking/get-started-overlay/) to see how to set up a Swarm cluster. The cluster will use the `overlay` driver by default, but you can specify it explicitly if you prefer - see below for how to do this.

## Specifying custom networks

Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](https://docs.docker.com/engine/extend/plugins_network/) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.
Instead of just using the default app network, you can specify your own networks with the top-level `networks` key. This lets you create more complex topologies and specify [custom network drivers](/engine/extend/plugins_network/) and options. You can also use it to connect services to externally-created networks which aren't managed by Compose.

Each service can specify what networks to connect to with the *service-level* `networks` key, which is a list of names referencing entries under the *top-level* `networks` key.

Expand Down
2 changes: 1 addition & 1 deletion compose/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,4 @@ individuals, we have a number of open channels for communication.

* To contribute code or documentation changes: please submit a [pull request on Github](https://github.com/docker/compose/pulls).

For more information and resources, please visit the [Getting Help project page](https://docs.docker.com/opensource/get-help/).
For more information and resources, please visit the [Getting Help project page](/opensource/get-help/).
4 changes: 2 additions & 2 deletions compose/swarm.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ format](compose-file.md#versioning) you are using:

- subject to the [limitations](swarm.md#limitations) described below,

- as long as the Swarm cluster is configured to use the [overlay driver](https://docs.docker.com/engine/userguide/networking/dockernetworks/#an-overlay-network),
- as long as the Swarm cluster is configured to use the [overlay driver](/engine/userguide/networking/dockernetworks/#an-overlay-network),
or a custom driver which supports multi-host networking.

Read [Get started with multi-host networking](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) to see how to
Read [Get started with multi-host networking](/engine/userguide/networking/get-started-overlay/) to see how to
set up a Swarm cluster with [Docker Machine](/machine/overview.md) and the overlay driver. Once you've got it running, deploying your app to it should be as simple as:

$ eval "$(docker-machine env --swarm <name of swarm master machine>)"
Expand Down
2 changes: 1 addition & 1 deletion compose/wordpress.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ This pulls the needed images, and starts the wordpress and database containers,

### Bring up WordPress in a web browser

If you're using [Docker Machine](https://docs.docker.com/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.
If you're using [Docker Machine](/machine/), then `docker-machine ip MACHINE_VM` gives you the machine address and you can open `http://MACHINE_VM_IP:8000` in a browser.

At this point, WordPress should be running on port `8000` of your Docker Host, and you can complete the "famous five-minute installation" as a WordPress administrator.

Expand Down
2 changes: 1 addition & 1 deletion cs-engine/release-notes/prior-release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,5 +340,5 @@ Because this addition is preventative, no CVE-ID is requested.
## CS Engine 1.6.0-cs2
(23 Apr 2015)

First release, see the [Docker Engine 1.6.0 Release notes](https://docs.docker.com/v1.6/release-notes/)
First release, see the [Docker Engine 1.6.0 Release notes](/v1.6/release-notes/)
for more details.
2 changes: 1 addition & 1 deletion docker-cloud/apps/ports.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ title: Publish and expose service or container ports

# Publish and expose service or container ports

In Docker Cloud you can **publish** or **expose** ports in services and containers, just like you can in Docker Engine (as documented [here](https://docs.docker.com/reference/run/#expose-incoming-ports) ).
In Docker Cloud you can **publish** or **expose** ports in services and containers, just like you can in Docker Engine (as documented [here](/reference/run/#expose-incoming-ports) ).

* **Exposed ports** are ports that a container or service is using either to
provide a service, or listen on. By default, exposed ports in Docker Cloud are
Expand Down
4 changes: 2 additions & 2 deletions docker-cloud/apps/service-links.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Docker Cloud creates a per-user overlay network which connects all containers ac
Docker Cloud gives your containers two ways find other services:

* Using service and container names directly as **hostnames**
* Using **service links**, which are based on [Docker Compose links](https://docs.docker.com/compose/compose-file/#links)
* Using **service links**, which are based on [Docker Compose links](/compose/compose-file/#links)

**Service and Container Hostnames** update automatically when a service scales up or down or redeploys. As a user, you can configure service names, and Docker Cloud uses these names to find the IP of the services and containers for you. You can use hostnames in your code to provide abstraction that allows you to easily swap service containers or components.

Expand Down Expand Up @@ -55,7 +55,7 @@ If the container making the query is part of a stack, and there is a local match
## Using service links for service discovery

Docker Cloud's service linking is modeled on [Docker Compose links](https://docs.docker.com/compose/compose-file/#links) to provide a basic service discovery functionality using directional links recorded in environment variables.
Docker Cloud's service linking is modeled on [Docker Compose links](/compose/compose-file/#links) to provide a basic service discovery functionality using directional links recorded in environment variables.

When you link a "client" service to a "server" service, Docker Cloud performs the following actions on the "client" service:

Expand Down
2 changes: 1 addition & 1 deletion docker-cloud/apps/volumes.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ redeployment, or shared with other services.
## Add a data volume to a service

Data volumes can be either specified in the image's `Dockerfile` using the
[VOLUME instruction](https://docs.docker.com/reference/builder/#volume), or when
[VOLUME instruction](/reference/builder/#volume), or when
creating a service.

To define a data volume in a service, specify the **container path** where it
Expand Down
2 changes: 1 addition & 1 deletion docker-cloud/builds/image-scan.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,4 @@ components.
## Related information

* [Learn about CVE and how it compiles data](https://cve.mitre.org/about/index.html).
* [How to create a Docker Official image](https://docs.docker.com/docker-hub/official_repos/)
* [How to create a Docker Official image](/docker-hub/official_repos/)
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@ Docker Cloud, deploy an app to your Cloud nodes, set environment variables,
scale the service, view logs, set up a load balancer and a data back end, and
set up a volume to save the data.

There's lots more to learn about Docker Cloud, so check out [the rest of our documentation](https://docs.docker.com/docker-cloud/), the [API and CLI Documentation](../../../apidocs/docker-cloud.md), and our [Knowledge Hub](https://success.docker.com/Cloud) and [Docker Cloud Forums](https://forums.docker.com/c/docker-cloud).
There's lots more to learn about Docker Cloud, so check out [the rest of our documentation](/docker-cloud/), the [API and CLI Documentation](../../../apidocs/docker-cloud.md), and our [Knowledge Hub](https://success.docker.com/Cloud) and [Docker Cloud Forums](https://forums.docker.com/c/docker-cloud).

Happy Docking!
2 changes: 1 addition & 1 deletion docker-cloud/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The following release notes document changes since [Tutum v0.19.5](https://suppo
- **Docker Cloud is Generally Available**: all features of Docker Cloud are Generally Available with the exception of the build features which remain in beta.
- **Docker Hub Registry Integration**: All of your Docker Hub image repositories are available and accessible when you login to Docker Cloud. Changes you make to your repositories are reflected in both Docker Hub and Docker Cloud.
- **Autoredeploy from Docker Hub**: services that use a repository stored in the Docker Hub now have the [**autoredeploy** option](apps/auto-redeploy.md) available, which allows automatic redeployments on push without setting up webhooks.
- **Environment variable substitution on CLI**: the `docker-cloud` CLI now substitutes environment variables in stack files, [the same way Docker Compose does it](https://docs.docker.com/compose/compose-file/#variable-substitution:91de898b5f5cdb090642a917d3dedf68).
- **Environment variable substitution on CLI**: the `docker-cloud` CLI now substitutes environment variables in stack files, [the same way Docker Compose does it](/compose/compose-file/#variable-substitution:91de898b5f5cdb090642a917d3dedf68).


### Changed
Expand Down
2 changes: 1 addition & 1 deletion docker-for-mac/docker-toolbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you already have an installation of Docker Toolbox, please read these topics

## The Docker Toolbox environment

Docker Toolbox installs `docker`, `docker-compose` and `docker-machine` in `/usr/local/bin` on your Mac. It also installs VirtualBox. At installation time, Toolbox uses `docker-machine` to provision a VirtualBox VM called `default`, running the `boot2docker` Linux distribution, with [Docker Engine](https://docs.docker.com/engine/) with certificates located on your Mac at `$HOME/.docker/machine/machines/default`.
Docker Toolbox installs `docker`, `docker-compose` and `docker-machine` in `/usr/local/bin` on your Mac. It also installs VirtualBox. At installation time, Toolbox uses `docker-machine` to provision a VirtualBox VM called `default`, running the `boot2docker` Linux distribution, with [Docker Engine](/engine/) with certificates located on your Mac at `$HOME/.docker/machine/machines/default`.

Before you use `docker` or `docker-compose` on your Mac, you typically use the command `eval $(docker-machine env default)` to set environment variables so that `docker` or `docker-compose` know how to talk to Docker Engine running on VirtualBox.

Expand Down
6 changes: 3 additions & 3 deletions docker-for-mac/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ For more about stable and beta channels, see the [FAQs](faqs.md#stable-and-beta-
>**Note**: If your system does not satisfy these requirements, you can install [Docker Toolbox](/toolbox/overview.md), which uses Oracle Virtual Box instead of HyperKit.
<p />
* **What the install includes**: The installation provides [Docker Engine](https://docs.docker.com/engine/userguide/intro/), Docker CLI client, [Docker Compose](https://docs.docker.com/compose/overview/), and [Docker Machine](https://docs.docker.com/machine/overview/).
* **What the install includes**: The installation provides [Docker Engine](/engine/userguide/intro/), Docker CLI client, [Docker Compose](/compose/overview/), and [Docker Machine](/machine/overview/).

## Step 1. Install and Run Docker for Mac

Expand Down Expand Up @@ -188,9 +188,9 @@ Choose <img src="images/whale-x.png"> --> **Preferences** from the menu bar. You
![Advanced Preference settings-advanced](images/settings-advanced.png)

* **Adding registries** - As an alternative to using [Docker Hub](https://hub.docker.com/) to store your public or private images or [Docker
Trusted Registry](https://docs.docker.com/docker-trusted-registry/overview/),
Trusted Registry](/docker-trusted-registry/overview/),
you can use Docker to set up your own insecure
[registry](https://docs.docker.com/registry/introduction/). Add URLs for
[registry](/registry/introduction/). Add URLs for
insecure registries and registry mirrors on which to host your images. (See
also, [How do I add custom CA
certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in the FAQs.)
Expand Down
2 changes: 1 addition & 1 deletion docker-for-mac/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ no_proxy=*.local, 169.254/16

You can see from the above output that the `HTTP_PROXY`, `http_proxy` and `no_proxy` environment variables are set.
When your proxy configuration changes, Docker restarts automatically to pick up the new settings.
If you have containers that you wish to keep running across restarts, you should consider using [restart policies](https://docs.docker.com/engine/reference/run/#restart-policies-restart)
If you have containers that you wish to keep running across restarts, you should consider using [restart policies](/engine/reference/run/#restart-policies-restart)

## Known Limitations, Use Cases, and Workarounds

Expand Down
2 changes: 1 addition & 1 deletion docker-for-mac/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ events or unexpected unmounts.

**Bug fixes and minor changes**

* Documentation moved to [https://docs.docker.com/docker-for-mac/](https://docs.docker.com/docker-for-mac/)
* Documentation moved to [https://docs.docker.com/docker-for-mac/](/docker-for-mac/)
* 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
Expand Down
4 changes: 2 additions & 2 deletions docker-for-windows/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ If you have not already done so, please install Docker for Windows. You can down
<p />
* Virtualization must be enabled. Typically, virtualization is enabled by default. (Note that this is different from having Hyper-V enabled.) For more detail see [Virtualization must be enabled](troubleshoot.md#virtualization-must-be-enabled) in Troubleshooting.
<br><br>
* **What the Docker for Windows install includes**: The installation provides [Docker Engine](https://docs.docker.com/engine/userguide/intro/), Docker CLI client, [Docker Compose](https://docs.docker.com/compose/overview/), and [Docker Machine](https://docs.docker.com/machine/overview/).
* **What the Docker for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/intro/), Docker CLI client, [Docker Compose](/compose/overview/), and [Docker Machine](/machine/overview/).
<p />
* You can run **Docker on Windows Server 16 and Windows 10** in two different ways:

Expand Down Expand Up @@ -385,7 +385,7 @@ no_proxy=*.local, 169.254/16

You can see from the above output that the `HTTP_PROXY`, `http_proxy` and `no_proxy` environment variables are set.
When your proxy configuration changes, Docker restarts automatically to pick up the new settings.
If you have containers that you wish to keep running across restarts, you should consider using [restart policies](https://docs.docker.com/engine/reference/run/#restart-policies-restart)
If you have containers that you wish to keep running across restarts, you should consider using [restart policies](/engine/reference/run/#restart-policies-restart)

### Docker daemon
You can configure options on the Docker daemon in the given JSON configuration file, and determine how your containers will run.
Expand Down
Loading

0 comments on commit 8fa5f3a

Please sign in to comment.