From 49d1ab0eb2ab5ed880e2e1ed66bb62c68b801457 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 12 Feb 2015 12:21:09 +1000 Subject: [PATCH] update the test code to enable testing the extra info Signed-off-by: Sven Dowideit --- docs/sources/articles/https/Dockerfile | 2 +- docs/sources/articles/https/Makefile | 8 +++--- docs/sources/articles/https/make_certs.sh | 32 +++++++++++------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/sources/articles/https/Dockerfile b/docs/sources/articles/https/Dockerfile index 494aa30305..a3cc132c51 100644 --- a/docs/sources/articles/https/Dockerfile +++ b/docs/sources/articles/https/Dockerfile @@ -6,5 +6,5 @@ ADD make_certs.sh / WORKDIR /data -VOLUMES ["/data"] +VOLUME ["/data"] CMD /make_certs.sh diff --git a/docs/sources/articles/https/Makefile b/docs/sources/articles/https/Makefile index b751c1e43f..f06e0d256e 100644 --- a/docs/sources/articles/https/Makefile +++ b/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 diff --git a/docs/sources/articles/https/make_certs.sh b/docs/sources/articles/https/make_certs.sh index 85b7ae153c..39001fdb50 100755 --- a/docs/sources/articles/https/make_certs.sh +++ b/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