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 docker-cloud/builds/push-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Images pushed to Docker Hub automatically appear for you in the **Launch new
service** wizard.

> **Note**: You must use Docker Engine 1.6 or later to push to Docker Hub.
Follow the <a href="http://docs.docker.com/installation/" target="_blank">official installation instructions</a> depending on your system.
Follow the <a href="/installation/" target="_blank">official installation instructions</a> depending on your system.

1. In a terminal window, set the environment variable **DOCKER_ID_USER** as *your username* in Docker Cloud.

Expand Down
2 changes: 1 addition & 1 deletion docker-cloud/getting-started/deploy-app/1_introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This tutorial assumes that you have:

- a free <a href="https://hub.docker.com/" target="_blank">Docker ID account</a>.
- at least one node running. If you don't have any nodes set up in Docker Cloud yet, [start here](../../getting-started/your_first_node.md) to set these up.
- (optional) Docker Engine installed - see the installation guides for <a href="https://docs.docker.com/installation/#installation" target="_blank">macOS, Windows and Linux</a>.
- (optional) Docker Engine installed - see the installation guides for <a href="/installation/#installation" target="_blank">macOS, Windows and Linux</a>.

Let's get started!

Expand Down
2 changes: 1 addition & 1 deletion docker-cloud/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ title: Welcome to the Docker Cloud docs!
<td class="plain" colspan="2"><p>Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the <a href="infrastructure/cloud-on-aws-faq.md">AWS FAQ</a> and <a href="infrastructure/cloud-on-packet.net-faq.md">Packet.net FAQ</a></p></td>
</tr>
<tr>
<td class="bluebar" colspan="2"> <a href="https://docs.docker.com/apidocs/docker-cloud/">API Docs</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="docker-errors-faq.md">Frequently Asked Questions</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="release-notes.md">Release Notes</a></td>
<td class="bluebar" colspan="2"> <a href="/apidocs/docker-cloud/">API Docs</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="docker-errors-faq.md">Frequently Asked Questions</a> &nbsp;&nbsp; ● &nbsp;&nbsp; <a href="release-notes.md">Release Notes</a></td>
</tr>
</table>
2 changes: 1 addition & 1 deletion docker-for-mac/docker-toolbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ The coexistence setup works as is as long as your VirtualBox VMs provisioned wit

Ideally, the Docker CLI client and Docker Engine should be the same version. Mismatches between client and server, and among host machines you might have created with Docker Machine can cause problems (client can't talk to the server or host machines).

If you already have <a href="https://docs.docker.com/toolbox/overview/" target="_blank">Docker Toolbox</a> installed, and then install Docker for Mac, you might get a newer version of the Docker client. Run `docker version` in a command shell to see client and server versions. In this example, the client installed with Docker for Mac is `Version: 1.11.1` and the server (which was installed earlier with Toolbox) is Version: 1.11.0.
If you already have <a href="/toolbox/overview/" target="_blank">Docker Toolbox</a> installed, and then install Docker for Mac, you might get a newer version of the Docker client. Run `docker version` in a command shell to see client and server versions. In this example, the client installed with Docker for Mac is `Version: 1.11.1` and the server (which was installed earlier with Toolbox) is Version: 1.11.0.

$ docker version
Client:
Expand Down
2 changes: 1 addition & 1 deletion docker-for-mac/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Registries](#custom-registries).
On the **Daemon -> Advanced dialog**, you can directly configure the daemon from
the JSON file, and determine entirely how your containers will run. For a full
list of options on the Docker daemon, see <a
href="https://docs.docker.com/engine/reference/commandline/dockerd/"
href="/engine/reference/commandline/dockerd/"
target="_blank">daemon</a> in the Docker Engine command line reference.

After editing the daemon configuration , click **Apply & Restart** to save it
Expand Down
2 changes: 1 addition & 1 deletion engine/getstarted/linux_install_help.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: 'Example: Install Docker on Ubuntu Linux'
This installation procedure for users who are unfamiliar with package
managers, and just want to try out the Getting Started tutorial while running Docker on Linux. If you are comfortable with package managers, prefer not to use
`curl`, or have problems installing and want to troubleshoot, please use our
`apt` and `yum` <a href="https://docs.docker.com/engine/installation/"
`apt` and `yum` <a href="/engine/installation/"
target="_blank">repositories instead for your installation</a>.

1. Log into your Ubuntu installation as a user with `sudo` privileges.
Expand Down
8 changes: 4 additions & 4 deletions engine/installation/cloud/cloud-ex-machine-ocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ To generate your access token:

1. If you have not done so already, install Docker Machine on your local host.

* <a href="https://docs.docker.com/engine/installation/mac/" target="_blank"> How to install Docker Machine on macOS</a>
* <a href="/engine/installation/mac/" target="_blank"> How to install Docker Machine on macOS</a>

* <a href="https://docs.docker.com/engine/installation/windows/" target="_blank">How to install Docker Machine on Windows</a>
* <a href="/engine/installation/windows/" target="_blank">How to install Docker Machine on Windows</a>

* <a href="https://docs.docker.com/machine/install-machine/" target="_blank">Install Docker Machine directly</a> (e.g., on Linux)
* <a href="/machine/install-machine/" target="_blank">Install Docker Machine directly</a> (e.g., on Linux)

2. At a command terminal, use `docker-machine ls` to get a list of Docker Machines and their status.

Expand Down Expand Up @@ -178,7 +178,7 @@ To generate your access token:

#### Understand the defaults and options on the create command

For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server). For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line. See also <a href="https://docs.docker.com/machine/drivers/os-base/" target="_blank">Driver options and operating system defaults</a> and information about the <a href="https://docs.docker.com/machine/reference/create/" target="_blank">create</a> command in the Docker Machine documentation.
For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server). For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line. See also <a href="/machine/drivers/os-base/" target="_blank">Driver options and operating system defaults</a> and information about the <a href="/machine/reference/create/" target="_blank">create</a> command in the Docker Machine documentation.


### Step 5. Use Machine to remove the Droplet
Expand Down
8 changes: 4 additions & 4 deletions machine/get-started-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The `docker-machine create` command typically requires that you specify, at a mi

For convenience, `docker-machine` will use sensible defaults for choosing settings such as the image that the server is based on, but you override the defaults using the respective flags (e.g. `--digitalocean-image`). This is useful if, for example, you want to create a cloud server with a lot of memory and CPUs (by default `docker-machine` creates a small server).

For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line, the <a href="../machine/reference/create/" target="_blank">create</a> command in the Machine <a href="../machine/reference/" target="_blank">command line reference</a>, and <a href="https://docs.docker.com/machine/drivers/os-base/" target="_blank">driver options and operating system defaults</a> in the Machine driver reference.
For a full list of the flags/settings available and their defaults, see the output of `docker-machine create -h` at the command line, the <a href="../machine/reference/create/" target="_blank">create</a> command in the Machine <a href="../machine/reference/" target="_blank">command line reference</a>, and <a href="/machine/drivers/os-base/" target="_blank">driver options and operating system defaults</a> in the Machine driver reference.

## Drivers for cloud providers

Expand All @@ -65,11 +65,11 @@ You can add a host to Docker which only has a URL and no driver. Then you can us

## Using Machine to provision Docker Swarm clusters

Docker Machine can also provision <a href="https://docs.docker.com/swarm/overview/" target="_blank">Docker Swarm</a> clusters. This can be used with any driver and will be secured with TLS.
Docker Machine can also provision <a href="/swarm/overview/" target="_blank">Docker Swarm</a> clusters. This can be used with any driver and will be secured with TLS.

* To get started with Swarm, see <a href="https://docs.docker.com/swarm/get-swarm/" target="_blank">How to get Docker Swarm</a>.
* To get started with Swarm, see <a href="/swarm/get-swarm/" target="_blank">How to get Docker Swarm</a>.

* To learn how to use Machine to provision a Swarm cluster, see <a href="https://docs.docker.com/swarm/provision-with-machine/" target="_blank">Provision a Swarm cluster with Docker Machine</a>.
* To learn how to use Machine to provision a Swarm cluster, see <a href="/swarm/provision-with-machine/" target="_blank">Provision a Swarm cluster with Docker Machine</a>.

## Where to go next
- Example: Provision Dockerized [Digital Ocean Droplets](examples/ocean.md)
Expand Down
6 changes: 3 additions & 3 deletions machine/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ Microsoft Hyper-V](drivers/hyper-v.md).)
* Make sure you have <a href="https://www.virtualbox.org/wiki/Downloads" target="_blank">the latest VirtualBox</a> correctly installed on your system. If
you used <a href="https://www.docker.com/products/docker-toolbox"
target="_blank">Toolbox</a> for <a
href="https://docs.docker.com/engine/installation/mac/" target="_blank">Mac</a>
or <a href="https://docs.docker.com/engine/installation/windows/"
href="/engine/installation/mac/" target="_blank">Mac</a>
or <a href="/engine/installation/windows/"
target="_blank">Windows</a> to install Docker Machine, VirtualBox is
automatically installed.
<br />
Expand Down Expand Up @@ -164,7 +164,7 @@ choose another name for this new machine.

**Note**: If you are using `fish`, or a Windows shell such as
Powershell/`cmd.exe` the above method will not work as described.
Instead, see <a href="https://docs.docker.com/machine/reference/env/" target="_blank">the `env` command's documentation</a>
Instead, see <a href="/machine/reference/env/" target="_blank">the `env` command's documentation</a>
to learn how to set the environment variables for your shell.

This sets environment variables for the current shell that the Docker client will read which specify the TLS settings. You need to do this each time you open a new shell or restart your machine.
Expand Down
10 changes: 5 additions & 5 deletions machine/install-machine.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ title: Install Docker Machine

On macOS and Windows, Machine is installed along with other Docker products when
you install the Docker Toolbox. For details on installing Docker Toolbox, see
the <a href="https://docs.docker.com/installation/mac/" target="_blank">macOS
the <a href="/installation/mac/" target="_blank">macOS
installation</a> instructions or <a
href="https://docs.docker.com/docker-for-windows/" target="_blank">Windows
href="/docker-for-windows/" target="_blank">Windows
installation</a> instructions.

If you want only Docker Machine, you can install the Machine binaries directly by following the instructions in the next section. You can find the latest versions of the binaries are on the <a href="https://github.com/docker/machine/releases/" target="_blank"> docker/machine release page</a> on GitHub.

## Installing Machine Directly

1. Install <a href="https://docs.docker.com/installation/"
1. Install <a href="/installation/"
target="_blank">the Docker binary</a>.

2. Download the Docker Machine binary and extract it to your PATH.
Expand Down Expand Up @@ -61,5 +61,5 @@ You can find additional documentation in the comments at the <a href="https://gi
- [Docker Machine overview](overview.md)
- Create and run a Docker host on your [local system using virtualization](get-started.md)
- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
- <a href="https://docs.docker.com/machine/drivers/" target="_blank">Docker Machine driver reference</a>
- <a href="https://docs.docker.com/machine/reference/" target="_blank">Docker Machine subcommand reference</a>
- <a href="/machine/drivers/" target="_blank">Docker Machine driver reference</a>
- <a href="/machine/reference/" target="_blank">Docker Machine subcommand reference</a>
16 changes: 8 additions & 8 deletions opensource/code.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,36 @@ If you are an experienced open source contributor you may be familiar with this
workflow. If you are new or just need reminders, the steps below link to more
detailed documentation in Docker's project contributors guide.

1. <a href="http://docs.docker.com/opensource/project/software-required/"
1. <a href="/opensource/project/software-required/"
target="_blank">Get the software</a> you need.

This explains how to install a couple of tools used in our development
environment. What you need (or don't need) might surprise you.

2. <a href="http://docs.docker.com/opensource/project/set-up-git/"
2. <a href="/opensource/project/set-up-git/"
target="_blank">Configure Git and fork the repo</a>.

Your Git configuration can make it easier for you to contribute.
Configuration is especially key if you are new to contributing or to Docker.

3. <a href="http://docs.docker.com/opensource/project/set-up-dev-env/"
3. <a href="/opensource/project/set-up-dev-env/"
target="_blank">Learn to work with the Docker development container</a>.

Docker developers run `docker` in `docker`. If you are a geek,
this is a pretty cool experience.
4. <a href="http://docs.docker.com/opensource/workflow/find-an-issue/"
4. <a href="/opensource/workflow/find-an-issue/"
target="_blank">Claim an issue</a> to work on.

We created a filter listing <a href="http://goo.gl/Hsp2mk" target="_blank">all open
and unclaimed issues</a> for Docker.

5. <a
href="http://docs.docker.com/opensource/workflow/work-issue/" target="_blank">Work on the
href="/opensource/workflow/work-issue/" target="_blank">Work on the
issue</a>.

If you change or add code or docs to a project, you should test your changes
as you work. This page explains <a
href="http://docs.docker.com/opensource/project/test-and-docs/" target="_blank">how to
href="/opensource/project/test-and-docs/" target="_blank">how to
test in our development environment</a>.

Also, remember to always **sign your commits** as you work! To sign your
Expand All @@ -61,7 +61,7 @@ issue</a>.
If you don't sign <a href="https://twitter.com/gordontheturtle"
target="_blank">Gordon</a> will get you!

6. <a href="http://docs.docker.com/opensource/workflow/create-pr/" target="_blank">Create a
6. <a href="/opensource/workflow/create-pr/" target="_blank">Create a
pull request</a>.

If you make a change to fix an issue, add reference to the issue in the pull
Expand All @@ -74,6 +74,6 @@ pull request</a>.
needs](code.md#what-is-the-pre-pull-request-checklist).


7. <a href="http://docs.docker.com/opensource/workflow/review-pr/"
7. <a href="/opensource/workflow/review-pr/"
target="_blank">Participate in the pull request review</a> till a successful
merge.
2 changes: 1 addition & 1 deletion opensource/kitematic/set_up_dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ You can set your signature globally or locally.
```

(To learn more, see <a
href="http://docs.docker.com/opensource/project/set-up-git/#set-your-signature-and-an-upstream-remote" target="_blank"> Set up your signature and an upstream remote</a>.)
href="/opensource/project/set-up-git/#set-your-signature-and-an-upstream-remote" target="_blank"> Set up your signature and an upstream remote</a>.)

## Install dependencies, start Kitematic, and verify your setup
Your Node.js install includes npm for package management. You'll use it to install supporting packages and start the app.
Expand Down
6 changes: 3 additions & 3 deletions opensource/ways/test.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ problems.

Testing documentation is relatively easy:

## Step 1. Find a page in <a href="http://docs.docker.com/" target="_blank">Docker's documentation</a> that contains a procedure or example you want to test.
## Step 1. Find a page in <a href="/" target="_blank">Docker's documentation</a> that contains a procedure or example you want to test.

You should choose something that _should work_ on your machine. For example,
<a href="http://docs.docker.com/articles/baseimages/" target="_blank">creating
<a href="/articles/baseimages/" target="_blank">creating
a base image</a> is something anyone with Docker can do. While <a
href="https://kitematic.com/docs/managing-volumes/" target="_blank">changing
volume directories in Kitematic</a> requires a Mac and Docker's Kitematic
Expand All @@ -47,6 +47,6 @@ What to look for:

# Test code in the Docker

If you are interested in writing or fixing test code for the Docker project, learn about <a href="https://docs.docker.com/opensource/project/test-and-docs/" target="_blank">our test infrastructure</a>.
If you are interested in writing or fixing test code for the Docker project, learn about <a href="/opensource/project/test-and-docs/" target="_blank">our test infrastructure</a>.

View <a href="https://goo.gl/JWuQPJ" target="_blank"> our open test issues</a> in Docker for something to work on. Or, create one of your own.
8 changes: 4 additions & 4 deletions test.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,12 @@ Some tables in markdown and html.
</tr>
<tr valign="top">
<td width="50%">
<a class="button darkblue-btn" href="https://docs.docker.com/">Go to the docs!</a><br><br>
<a href="https://docs.docker.com/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a>
<a class="button darkblue-btn" href="/">Go to the docs!</a><br><br>
<a href="/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a>
</td>
<td width="50%">
<a class="button darkblue-btn" href="https://docs.docker.com/">Go to the docs!</a><br><br>
<a href="https://docs.docker.com/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a>
<a class="button darkblue-btn" href="/">Go to the docs!</a><br><br>
<a href="/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a>
</td>
</tr>
</table>
Expand Down