Expand documentation for --insecure-registries
@@ -196,6 +196,16 @@ can be disabled with --ip-masq=false.
+By default docker will assume all registries are securied via TLS. Prior versions
+of docker used an auto fallback if a registry did not support TLS. This introduces
+the opportunity for MITM attacks so in Docker 1.2 the user must specify `--insecure-registries`
+when starting the Docker daemon to state which registries are not using TLS and to communicate
+with these registries via plain text. If you are running a local registry over plain text
+on `127.0.0.1:5000` you will be required to specify `--insecure-registries 127.0.0.1:500`
+when starting the docker daemon to be able to push and pull images to that registry.
+No automatic fallback will happen after Docker 1.2 to detect if a registry is using
+HTTP or HTTPS.
+
Docker supports softlinks for the Docker data directory
(`/var/lib/docker`) and for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be set like this:
