Merge pull request #278 from testcontainers/further_docs_tweaks

Rename Docker-in-Docker references
testcontainers · Jan 22, 2017 · f0ccec9 · f0ccec9
2 parents 3b5165e + 0c0244d
commit f0ccec9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
@@ -8,7 +8,7 @@
     * [Usage modes](usage.md#usage-modes)
     * [Maven dependencies](usage.md#maven-dependencies)
     * [Logging](usage.md#logging)
-    * [Docker in Docker](usage/dind.md)
+    * [Running inside Docker](usage/inside_docker.md)
 
 ## Generic containers
 

diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -5,7 +5,7 @@
 | Linux - general                     | Docker v1.10              |                                                                                                                                                                                                                                                                                                                                                                    |
 | Linux - Travis CI                   | Docker v1.10              | See [example .travis.yml](https://raw.githubusercontent.com/testcontainers/testcontainers-java/master/.travis.yml) for baseline Travis CI configuration                                                                                                                                                                                                                                                                                     |
 | Linux - Circle CI (LXC driver)      | Docker v1.9.1               | The `exec` feature is not compatible with Circle CI. See [example circle.yml](../circle.yml) for baseline CircleCI configuration                                                                                                                                                                                                                                   |
-| Linux - Docker in Docker            | Docker v1.12              | See [Docker-in-Docker](usage/dind.md) for the detailed configuration                                                                                                                                                                                                                                 |
+| Linux - within a Docker container            | Docker v1.12              | See [Running inside Docker](usage/inside_docker.md) for the detailed configuration                                                                                                                                                                                                                                 |
 | Mac OS X - Docker Toolbox           | Docker Machine v0.8.0  |                                                                                                                                                                                                                                                                                                                                                                    |
 | Mac OS X - Docker for Mac      | 1.12.0          | *Support is best-efforts at present*. `getTestHostIpAddress()` is [not currently supported](https://github.com/testcontainers/testcontainers-java/issues/166) due to limitations in Docker for Mac. |
 | Windows - Docker Toolbox            |                             | *Support is limited at present and this is not currently tested on a regular basis*.                                                                                                                                                                                                                                                                               |

diff --git a/docs/usage.md b/docs/usage.md
@@ -19,7 +19,7 @@ Testcontainers will try to connect to a Docker daemon using the following strate
 	* `DOCKER_TLS_VERIFY=1`
 	* `DOCKER_CERT_PATH=~/.docker`
 * If Docker Machine is installed, the docker machine environment for the *first* machine found. Docker Machine needs to be on the PATH for this to succeed.
-* If you're going to run your tests inside a container, please read [Docker in Docker](usage/dind.md) first.
+* If you're going to run your tests inside a container, please read [Running inside a Docker container](usage/inside_docker.md) first.
 
 ### Usage modes
 

diff --git a/docs/usage/dind.md → docs/usage/inside_docker.md b/docs/usage/dind.md → docs/usage/inside_docker.md
@@ -1,4 +1,4 @@
-# Docker in Docker
+# Running inside a Docker container
 
 > Since 1.1.8