docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rendering fixes, part 1 (up through cs-engine)

This commit is contained in:
John Mulhausen 2016-09-30 19:38:30 -07:00
parent 39055aeab4
commit a0ee6c6004
19 changed files with 242 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
cs-engine/release-notes/prior-release-notes.md
View File

@ -57,7 +57,7 @@ for all the kernels that the base CS Engine is supported on.
>**Note**: Centos 7 has its firewall enabled by default and it prevents the VXLAN tunnel from communicating. If this applies to you, then after installing the CS Engine, execute the following command in the Linux host: >**Note**: Centos 7 has its firewall enabled by default and it prevents the VXLAN tunnel from communicating. If this applies to you, then after installing the CS Engine, execute the following command in the Linux host:
`sudo firewall-cmd --zone=public --permanent --add-port=4789/udp` sudo firewall-cmd --zone=public --permanent --add-port=4789/udp
* Corrected an issue where Docker didn't remove the Masquerade NAT rule from `iptables` when the network was removed. This caused the gateway address to be * Corrected an issue where Docker didn't remove the Masquerade NAT rule from `iptables` when the network was removed. This caused the gateway address to be
@ -138,54 +138,53 @@ SELinux will be unable to use hostname-based network access in either `docker bu
For example, you see will failures such as: For example, you see will failures such as:
``` ```bash
[root@dtr ~]# docker -v [root@dtr ~]# docker -v
Docker version 1.6.0-cs2, build b8dd430 Docker version 1.6.0-cs2, build b8dd430
[root@dtr ~]# ping dtr.home.org.au [root@dtr ~]# ping dtr.home.org.au
PING dtr.home.org.au (10.10.10.104) 56(84) bytes of data. PING dtr.home.org.au (10.10.10.104) 56(84) bytes of data.
64 bytes from dtr.home.gateway (10.10.10.104): icmp_seq=1 ttl=64 time=0.663 ms 64 bytes from dtr.home.gateway (10.10.10.104): icmp_seq=1 ttl=64 time=0.663 ms
^C ^C
--- dtr.home.org.au ping statistics --- --- dtr.home.org.au ping statistics ---
2 packets transmitted, 2 received, 0% packet loss, time 1001ms 2 packets transmitted, 2 received, 0% packet loss, time 1001ms
rtt min/avg/max/mdev = 0.078/0.370/0.663/0.293 ms rtt min/avg/max/mdev = 0.078/0.370/0.663/0.293 ms
[root@dtr ~]# docker run --rm -it debian ping dtr.home.org.au [root@dtr ~]# docker run --rm -it debian ping dtr.home.org.au
ping: unknown host ping: unknown host
[root@dtr ~]# docker run --rm -it debian cat /etc/resolv.conf [root@dtr ~]# docker run --rm -it debian cat /etc/resolv.conf
cat: /etc/resolv.conf: Permission denied cat: /etc/resolv.conf: Permission denied
[root@dtr ~]# docker run --rm -it debian apt-get update [root@dtr ~]# docker run --rm -it debian apt-get update
Err http://httpredir.debian.org jessie InRelease Err http://httpredir.debian.org jessie InRelease
Err http://security.debian.org jessie/updates InRelease Err http://security.debian.org jessie/updates InRelease
Err http://httpredir.debian.org jessie-updates InRelease Err http://httpredir.debian.org jessie-updates InRelease
Err http://security.debian.org jessie/updates Release.gpg Err http://security.debian.org jessie/updates Release.gpg
Could not resolve 'security.debian.org' Could not resolve 'security.debian.org'
Err http://httpredir.debian.org jessie Release.gpg Err http://httpredir.debian.org jessie Release.gpg
Could not resolve 'httpredir.debian.org' Could not resolve 'httpredir.debian.org'
Err http://httpredir.debian.org jessie-updates Release.gpg Err http://httpredir.debian.org jessie-updates Release.gpg
Could not resolve 'httpredir.debian.org' Could not resolve 'httpredir.debian.org'
[output truncated] [output truncated]
```
```
or when running a `docker build`: or when running a `docker build`:
``` ```bash
[root@dtr ~]# docker build . [root@dtr ~]# docker build .
Sending build context to Docker daemon 11.26 kB Sending build context to Docker daemon 11.26 kB
Sending build context to Docker daemon Sending build context to Docker daemon
Step 0 : FROM fedora Step 0 : FROM fedora
---> e26efd418c48 ---> e26efd418c48
Step 1 : RUN yum install httpd Step 1 : RUN yum install httpd
---> Running in cf274900ea35 ---> Running in cf274900ea35
One of the configured repositories failed (Fedora 21 - x86_64), One of the configured repositories failed (Fedora 21 - x86_64),
and yum doesn't have enough cached data to continue. At this point the only and yum doesn't have enough cached data to continue. At this point the only
safe thing yum can do is fail. There are a few ways to work "fix" this: safe thing yum can do is fail. There are a few ways to work "fix" this:
[output truncated] [output truncated]
``` ```
**Affected Versions**: All previous versions of Docker Engine when SELinux is **Affected Versions**: All previous versions of Docker Engine when SELinux is
enabled. enabled.
@ -211,28 +210,34 @@ When upgrading, make sure you stop Docker Trusted Registry first, perform the En
If you are running with SELinux enabled, previous Docker Engine releases allowed If you are running with SELinux enabled, previous Docker Engine releases allowed
you to bind-mount additional volumes or files inside the container as follows: you to bind-mount additional volumes or files inside the container as follows:
`$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro <imagename>` $ docker run -it -v /home/user/foo.txt:/foobar.txt:ro <imagename>
In the 1.6.2-cs5 release, you must ensure additional bind-mounts have the In the 1.6.2-cs5 release, you must ensure additional bind-mounts have the
correct SELinux context. For example, if you want to mount `foobar.txt` as correct SELinux context. For example, if you want to mount `foobar.txt` as
read-only into the container, do the following to create and test your read-only into the container, do the following to create and test your
bind-mount: bind-mount:
1. Add the `z` option to the bind mount when you specify `docker run`. 1. Add the `z` option to the bind mount when you specify `docker run`.
```bash
$ docker run -it -v /home/user/foo.txt:/foobar.txt:ro,z <imagename> $ docker run -it -v /home/user/foo.txt:/foobar.txt:ro,z <imagename>
```
2. Exec into your new container. 2. Exec into your new container.
For example, if your container is `bashful_curie`, open a shell on the For example, if your container is `bashful_curie`, open a shell on the
container: container:
```bash
$ docker exec -it bashful_curie bash $ docker exec -it bashful_curie bash
```
3. Use `cat` to check the permissions on the mounted file. 3. Use `cat` to check the permissions on the mounted file.
```bash
$ cat /foobar.txt $ cat /foobar.txt
the contents of foobar appear the contents of foobar appear
```
If you see the file's contents, your mount succeeded. If you receive a If you see the file's contents, your mount succeeded. If you receive a
`Permission denied` message and/or the `/var/log/audit/audit.log` file on your `Permission denied` message and/or the `/var/log/audit/audit.log` file on your

9
docker-for-mac/examples.md
View File

@ -18,11 +18,8 @@ Examples will highlight develop, build, and run workflows in several languages,
For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows. For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows.
<a href=https://docs.docker.com/compose/django/ target="_blank">Quickstart: Compose and Django</a> - [Quickstart: Compose and Django](/compose/django/)
- [Quickstart: Compose and Rails](/compose/rails/)
<a href=https://docs.docker.com/compose/rails/ target="_blank">Quickstart: Compose and Rails</a> - [Quickstart: Compose and WordPress](/compose/wordpress/)
<a href=https://docs.docker.com/compose/wordpress/ target="_blank">Quickstart: Compose and WordPress</a>
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub. See also [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.

11
docker-for-windows/examples.md
View File

@ -18,11 +18,8 @@ Examples will highlight develop, build, and run workflows in several languages,
For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows. For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows.
<a href=https://docs.docker.com/compose/django/ target="_blank">Quickstart: Compose and Django</a> - [Quickstart: Compose and Django](/compose/django/)
- [Quickstart: Compose and Rails](/compose/rails/)
<a href=https://docs.docker.com/compose/rails/ target="_blank">Quickstart: Compose and Rails</a> - [Quickstart: Compose and WordPress](/compose/wordpress/)
<a href=https://docs.docker.com/compose/wordpress/ target="_blank">Quickstart: Compose and WordPress</a>
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.
See also [learn by example](/engine/tutorials/) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.

6
docker-for-windows/troubleshoot.md
View File

@ -24,7 +24,6 @@ Here is information about how to diagnose and troubleshoot problems, send logs a
If you encounter problems for which you do not find solutions in this documentation or on the [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows), we can help you troubleshoot the log data. See [Diagnose and Feedback](index.md#diagnose-and-feedback) in the Getting Started topic. If you encounter problems for which you do not find solutions in this documentation or on the [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows), we can help you troubleshoot the log data. See [Diagnose and Feedback](index.md#diagnose-and-feedback) in the Getting Started topic.
<a name="logs"></a>
## Checking the Logs ## Checking the Logs
In addition to using the diagnose and feedback option to submit logs, you can browse the logs yourself. In addition to using the diagnose and feedback option to submit logs, you can browse the logs yourself.
@ -38,7 +37,6 @@ To view Docker for Windows latest log, click on the `Diagnose & Feedback` menu e
If you encounter an issue and the suggested troubleshoot procedures outlined below don't fix it you can generate a diagnostics report. Click on the `Diagnose & Feedback` menu entry in the systray and then on the `Upload diagnostic...` link. This will upload diagnostics to our server and provide you with a unique ID you can use in email or the forum to reference the upload. If you encounter an issue and the suggested troubleshoot procedures outlined below don't fix it you can generate a diagnostics report. Click on the `Diagnose & Feedback` menu entry in the systray and then on the `Upload diagnostic...` link. This will upload diagnostics to our server and provide you with a unique ID you can use in email or the forum to reference the upload.
<a name="troubleshoot"></a>
## Troubleshooting ## Troubleshooting
### inotify on shared drives does not work ### inotify on shared drives does not work
@ -122,6 +120,7 @@ To fix existing containers, follow these steps.
1. Run this command. 1. Run this command.
```bash
$ docker run --rm -v /var/lib/docker:/docker cpuguy83/docker112rc3-runtimefix:rc3 $ docker run --rm -v /var/lib/docker:/docker cpuguy83/docker112rc3-runtimefix:rc3
Unable to find image 'cpuguy83/docker112rc3-runtimefix:rc3' locally Unable to find image 'cpuguy83/docker112rc3-runtimefix:rc3' locally
@ -140,6 +139,7 @@ To fix existing containers, follow these steps.
proccessed dea73dc21126434f14c58b83140bf6470aa67e622daa85603a13bc48af7f8b04 proccessed dea73dc21126434f14c58b83140bf6470aa67e622daa85603a13bc48af7f8b04
proccessed dfa8f9278642ab0f3e82ee8e4ad029587aafef9571ff50190e83757c03b4216c proccessed dfa8f9278642ab0f3e82ee8e4ad029587aafef9571ff50190e83757c03b4216c
proccessed ee5bf706b6600a46e5d26327b13c3c1c5f7b261313438d47318702ff6ed8b30b proccessed ee5bf706b6600a46e5d26327b13c3c1c5f7b261313438d47318702ff6ed8b30b
```
2. Quit Docker. 2. Quit Docker.
@ -149,8 +149,10 @@ To fix existing containers, follow these steps.
4. Try to start the container again: 4. Try to start the container again:
```bash
$ docker start old-container $ docker start old-container
old-container old-container
```
### Hyper-V ### Hyper-V
Docker for Windows requires a Hyper-V as well as the Hyper-V Module for Windows Powershell to be installed and enabled. See [these instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) to install Hyper-V manually. A reboot is *required*. If you install Hyper-V without the reboot, Docker for Windows will not work correctly. On some systems, Virtualization needs to be enabled in the BIOS. The steps to do so are Vendor specific, but typically the BIOS option is called `Virtualization Technology (VTx)` or similar. Docker for Windows requires a Hyper-V as well as the Hyper-V Module for Windows Powershell to be installed and enabled. See [these instructions](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick_start/walkthrough_install) to install Hyper-V manually. A reboot is *required*. If you install Hyper-V without the reboot, Docker for Windows will not work correctly. On some systems, Virtualization needs to be enabled in the BIOS. The steps to do so are Vendor specific, but typically the BIOS option is called `Virtualization Technology (VTx)` or similar.

2
engine/getstarted/step_three.md
View File

@ -22,7 +22,7 @@ image you'll use in the rest of this getting started.
## Step 1: Locate the whalesay image ## Step 1: Locate the whalesay image
1. Open your browser and <a href="https://hub.docker.com/?utm_source=getting_started_guide&utm_medium=embedded_MacOSX&utm_campaign=find_whalesay" target=_blank> browse to the Docker Hub</a>. 1. Open your browser and [browse to the Docker Hub](https://hub.docker.com/?utm_source=getting_started_guide&utm_medium=embedded_MacOSX&utm_campaign=find_whalesay).
![Browse Docker Hub](tutimg/browse_and_search.png) ![Browse Docker Hub](tutimg/browse_and_search.png)

2
engine/security/certificates.md
View File

@ -72,7 +72,7 @@ key and then use the key to create the certificate.
## Troubleshooting tips ## Troubleshooting tips
The Docker daemon interprets ``.crt` files as CA certificates and `.cert` files The Docker daemon interprets `.crt` files as CA certificates and `.cert` files
as client certificates. If a CA certificate is accidentally given the extension as client certificates. If a CA certificate is accidentally given the extension
`.cert` instead of the correct `.crt` extension, the Docker daemon logs the `.cert` instead of the correct `.crt` extension, the Docker daemon logs the
following error message: following error message:

4
engine/swarm/services.md
View File

@ -138,8 +138,8 @@ Swarm mode lets you network services in a couple of ways:
### Publish ports externally to the swarm ### Publish ports externally to the swarm
You publish service ports externally to the swarm using the `--publish You publish service ports externally to the swarm using the `--publish<TARGET-PORT>:<SERVICE-PORT>`
<TARGET-PORT>:<SERVICE-PORT>` flag. When you publish a service port, the swarm flag. When you publish a service port, the swarm
makes the service accessible at the target port on every node regardless if makes the service accessible at the target port on every node regardless if
there is a task for the service running on the node. there is a task for the service running on the node.

8
engine/swarm/swarm-tutorial/create-swarm.md
View File

@ -26,10 +26,10 @@ node. For example, the tutorial uses a machine named `manager1`.
``` ```
>**Note:** If you are using Docker for Mac or Docker for Windows to test >**Note:** If you are using Docker for Mac or Docker for Windows to test
single-node swarm, simply run `docker swarm init` with no arguments. There is no single-node swarm, simply run `docker swarm init` with no arguments. There is no
need to specify ` --advertise-addr` in this case. To learn more, see the topic need to specify `--advertise-addr` in this case. To learn more, see the topic
on how to [Use Docker for Mac or Docker for on how to [Use Docker for Mac or Docker for
Windows](index.md#use-docker-for-mac-or-docker-for-windows) with Swarm. Windows](index.md#use-docker-for-mac-or-docker-for-windows) with Swarm.
In the tutorial, the following command creates a swarm on the `manager1` In the tutorial, the following command creates a swarm on the `manager1`
machine: machine:

2
engine/swarm/swarm-tutorial/inspect-service.md
View File

@ -42,7 +42,7 @@ about a service in an easily readable format.
>**Tip**: To return the service details in json format, run the same command >**Tip**: To return the service details in json format, run the same command
without the `--pretty` flag. without the `--pretty` flag.
``` ```json
$ docker service inspect helloworld $ docker service inspect helloworld
[ [
{ {