From eaf1b88212bb10019cf1d7b1555a305c12001f06 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@docker.com>
Date: Fri, 23 Jan 2015 12:17:55 +1000
Subject: [PATCH] comment out the docker and curl lines we'll run later
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
---
docs/sources/articles/https/Makefile | 7 ++++---
docs/sources/articles/https/parsedocs.sh | 8 +++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/docs/sources/articles/https/Makefile b/docs/sources/articles/https/Makefile
index 48fe49f2b6..b751c1e43f 100644
--- a/docs/sources/articles/https/Makefile
+++ b/docs/sources/articles/https/Makefile
@@ -13,11 +13,12 @@ cert: build
certs: cert
run:
- docker -d -D --tlsverify --tlscacert=ca.pem --tlscert=server-cert.pem --tlskey=server-key.pem -H=0.0.0.0:6666 --pidfile=$(pwd)/docker.pid --graph=$(pwd)/graph
+ sudo docker -d -D --tlsverify --tlscacert=ca.pem --tlscert=server-cert.pem --tlskey=server-key.pem -H=0.0.0.0:6666 --pidfile=$(pwd)/docker.pid --graph=$(pwd)/graph
client:
- docker --tls --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem -H=$(HOST):6666 version
- docker --tlsverify --tlscacert=ca.pem --tlscert=cert.pem --tlskey=key.pem -H=$(HOST):6666 info
+ 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
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
diff --git a/docs/sources/articles/https/parsedocs.sh b/docs/sources/articles/https/parsedocs.sh
index 56be4103a4..f9df33c337 100755
--- a/docs/sources/articles/https/parsedocs.sh
+++ b/docs/sources/articles/https/parsedocs.sh
@@ -1,4 +1,10 @@
#!/bin/sh
echo "#!/bin/sh"
-cat ../https.md | awk '{if (sub(/\\$/,"")) printf "%s", $0; else print $0}' | grep ' $ ' | sed 's/ $ //g' | sed 's/2375/7777/g' | sed 's/2376/7778/g'
+cat ../https.md | awk '{if (sub(/\\$/,"")) printf "%s", $0; else print $0}' \
+ | grep ' $ ' \
+ | sed 's/ $ //g' \
+ | sed 's/2375/7777/g' \
+ | sed 's/2376/7778/g' \
+ | sed 's/^docker/# docker/g' \
+ | sed 's/^curl/# curl/g'