From 0c0244d8d710b97c3c33d668753f2d9866d481a4 Mon Sep 17 00:00:00 2001 From: Richard North Date: Sun, 22 Jan 2017 08:03:59 +0000 Subject: [PATCH] Rename Docker-in-Docker references to 'running inside docker' to avoid confusion with the DinD project which is not _quite_ the same thing (DinD is probably a _subset_ of what Testcontainers supports) --- docs/SUMMARY.md | 2 +- docs/compatibility.md | 2 +- docs/usage.md | 2 +- docs/usage/{dind.md => inside_docker.md} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename docs/usage/{dind.md => inside_docker.md} (98%) diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index e0f8eefcb40..4ea04004529 100644 --- 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 index a3418fa3c77..aca1d8c3d12 100644 --- 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 index 0b4a65ed429..11811de2f67 100644 --- 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 b/docs/usage/inside_docker.md similarity index 98% rename from docs/usage/dind.md rename to docs/usage/inside_docker.md index ded3c0f7de7..f4773dcb147 100644 --- a/docs/usage/dind.md +++ b/docs/usage/inside_docker.md @@ -1,4 +1,4 @@ -# Docker in Docker +# Running inside a Docker container > Since 1.1.8