瀏覽代碼

Merge pull request #10293 from SvenDowideit/test-9952

comment out the docker and curl lines we'll run later
Fred Lifton 10 年之前
父節點
當前提交
5b9b5aff06
共有 2 個文件被更改,包括 11 次插入4 次删除
  1. 4 3
      docs/sources/articles/https/Makefile
  2. 7 1
      docs/sources/articles/https/parsedocs.sh

+ 4 - 3
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

+ 7 - 1
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'