mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	retooling for hugo
Tweaking for Hugo Updating the Dockerfile with new sed; fix broken link on Kitematic Fixing image pull for Dockerfile Removing docs targets Signed-off-by: Mary Anthony <mary@docker.com>
This commit is contained in:
		
							parent
							
								
									3f11e05db2
								
							
						
					
					
						commit
						f93fee5f48
					
				
					 290 changed files with 1243 additions and 1701 deletions
				
			
		
							
								
								
									
										10
									
								
								docs/articles/https/Dockerfile
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								docs/articles/https/Dockerfile
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,10 @@ | |||
| FROM debian | ||||
| 
 | ||||
| RUN apt-get update && apt-get install -yq openssl | ||||
| 
 | ||||
| ADD make_certs.sh / | ||||
| 
 | ||||
| 
 | ||||
| WORKDIR /data | ||||
| VOLUME ["/data"] | ||||
| CMD /make_certs.sh | ||||
							
								
								
									
										24
									
								
								docs/articles/https/Makefile
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								docs/articles/https/Makefile
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,24 @@ | |||
| 
 | ||||
| HOST:=boot2docker | ||||
| 
 | ||||
| makescript: | ||||
| 	./parsedocs.sh > make_certs.sh | ||||
| 
 | ||||
| build: clean makescript | ||||
| 	docker build -t makecerts . | ||||
| 
 | ||||
| cert: build | ||||
| 	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 | ||||
| 
 | ||||
| run: | ||||
| 	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: | ||||
| 	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 -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 | ||||
							
								
								
									
										26
									
								
								docs/articles/https/README.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								docs/articles/https/README.md
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,26 @@ | |||
| 
 | ||||
| 
 | ||||
| This is an initial attempt to make it easier to test the examples in the https.md | ||||
| doc | ||||
| 
 | ||||
| at this point, it has to be a manual thing, and I've been running it in boot2docker | ||||
| 
 | ||||
| so my process is | ||||
| 
 | ||||
| $ boot2docker ssh | ||||
| $$ git clone https://github.com/docker/docker | ||||
| $$ cd docker/docs/sources/articles/https | ||||
| $$ make cert | ||||
| lots of things to see and manually answer, as openssl wants to be interactive | ||||
| **NOTE:** make sure you enter the hostname (`boot2docker` in my case) when prompted for `Computer Name`) | ||||
| $$ sudo make run | ||||
| 
 | ||||
| start another terminal | ||||
| 
 | ||||
| $ boot2docker ssh | ||||
| $$ cd docker/docs/sources/articles/https | ||||
| $$ make client | ||||
| 
 | ||||
| the last will connect first with `--tls` and then with `--tlsverify` | ||||
| 
 | ||||
| both should succeed | ||||
							
								
								
									
										23
									
								
								docs/articles/https/make_certs.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								docs/articles/https/make_certs.sh
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,23 @@ | |||
| #!/bin/sh | ||||
| openssl genrsa -aes256 -out ca-key.pem 2048 | ||||
| openssl req -new -x509 -days 365 -key ca-key.pem -sha256 -out ca.pem | ||||
| openssl genrsa -out server-key.pem 2048 | ||||
| openssl req -subj "/CN=$HOST" -new -key server-key.pem -out server.csr | ||||
| 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 | ||||
| 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 | ||||
							
								
								
									
										10
									
								
								docs/articles/https/parsedocs.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										10
									
								
								docs/articles/https/parsedocs.sh
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +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' \ | ||||
|         | sed 's/^docker/# docker/g' \ | ||||
|         | sed 's/^curl/# curl/g' | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Mary Anthony
						Mary Anthony