Merge pull request #10722 from SvenDowideit/takeover-10710

added -extfile to server certificate documentation

docs/sources/articles/https.md

@@ -71,8 +71,14 @@ name) matches the hostname you will use to connect to Docker:
 
 Next, we're going to sign the public key with our CA:
 
+Since TLS connections can be made via IP address as well as DNS name, they need
+to be specified when creating the certificate. For example, to allow connections
+using `10.10.10.20` and `127.0.0.1`:
+
+    $ echo subjectAltName = IP:10.10.10.20,IP:127.0.0.1 > extfile.cnf
+
     $ openssl x509 -req -days 365 -in server.csr -CA ca.pem -CAkey ca-key.pem \
-      -CAcreateserial -out server-cert.pem
+      -CAcreateserial -out server-cert.pem -extfile extfile.cnf
     Signature ok
     subject=/CN=your.host.com
     Getting CA Private Key

docs/sources/articles/https/Dockerfile

@@ -6,5 +6,5 @@ ADD make_certs.sh /
 
 
 WORKDIR /data
-VOLUMES ["/data"]
+VOLUME ["/data"]
 CMD /make_certs.sh

docs/sources/articles/https/Makefile

@@ -4,11 +4,11 @@ HOST:=boot2docker
 makescript:
 	./parsedocs.sh > make_certs.sh
 
-build: makescript
+build: clean makescript
 	docker build -t makecerts .
 
 cert: build
-	docker run --rm -it -v $(CURDIR):/data -e HOST=$(HOST) makecerts
+	docker run --rm -it -v $(CURDIR):/data -e HOST=$(HOST) -e YOUR_PUBLIC_IP=$(shell ip a | grep "inet " | sed "s/.*inet \([0-9.]*\)\/.*/\1/" | xargs echo | sed "s/ /,IP:/g") makecerts
 
 certs: cert
 
@@ -18,7 +18,7 @@ run:
 client:
 	sudo docker --tls --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem   -H=$(HOST):6666 version
 	sudo docker --tlsverify --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem   -H=$(HOST):6666 info
-	sudo curl https://$(HOST):6666/images/json --cert cert.pem --key key.pem --cacert ca.pem
+	sudo curl https://$(HOST):6666/images/json --cert ./cert.pem --key ./key.pem --cacert ./ca.pem
 
 clean:
-	rm ca-key.pem ca.pem ca.srl cert.pem client.csr extfile.cnf key.pem server-cert.pem server-key.pem server.csr
+	rm -f ca-key.pem ca.pem ca.srl cert.pem client.csr extfile.cnf key.pem server-cert.pem server-key.pem server.csr extfile.cnf

docs/sources/articles/https/make_certs.sh

@@ -1,23 +1,23 @@
-#!/bin/bash
-
+#!/bin/sh
 openssl genrsa -aes256 -out ca-key.pem 2048
-
-echo "enter your Docker daemon's hostname as the 'Common Name'= ($HOST)"
-
-#TODO add this as an ENV to docker run?
 openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -out ca.pem
-
-
-# server cert
 openssl genrsa -out server-key.pem 2048
 openssl req -subj "/CN=$HOST" -new -key server-key.pem -out server.csr
-openssl x509 -req -days 365 -in server.csr -CA ca.pem -CAkey ca-key.pem \
-  -CAcreateserial -out server-cert.pem
-
-#client cert
+echo subjectAltName = IP:$YOUR_PUBLIC_IP > extfile.cnf
+openssl x509 -req -days 365 -in server.csr -CA ca.pem -CAkey ca-key.pem       -CAcreateserial -out server-cert.pem -extfile extfile.cnf
 openssl genrsa -out key.pem 2048
 openssl req -subj '/CN=client' -new -key key.pem -out client.csr
-
 echo extendedKeyUsage = clientAuth > extfile.cnf
-openssl x509 -req -days 365 -in client.csr -CA ca.pem -CAkey ca-key.pem \
-  -CAcreateserial -out cert.pem -extfile extfile.cnf
+openssl x509 -req -days 365 -in client.csr -CA ca.pem -CAkey ca-key.pem       -CAcreateserial -out cert.pem -extfile extfile.cnf
+rm -v client.csr server.csr
+chmod -v 0400 ca-key.pem key.pem server-key.pem
+chmod -v 0444 ca.pem server-cert.pem cert.pem
+# docker -d --tlsverify --tlscacert=ca.pem --tlscert=server-cert.pem --tlskey=server-key.pem       -H=0.0.0.0:7778
+# docker --tlsverify --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem       -H=$HOST:7778 version
+mkdir -pv ~/.docker
+cp -v {ca,cert,key}.pem ~/.docker
+export DOCKER_HOST=tcp://$HOST:7778 DOCKER_TLS_VERIFY=1
+# docker ps
+export DOCKER_CERT_PATH=~/.docker/zone1/
+# docker --tlsverify ps
+# curl https://$HOST:7778/images/json       --cert ~/.docker/cert.pem       --key ~/.docker/key.pem       --cacert ~/.docker/ca.pem