Add "DOCKER_TLS_CERTDIR" for docker-library/docker#166

tianon · tianon · commit 7e44f391f28e · 2019-07-16T19:25:19.000-07:00
For images which don't support this feature, this will be a no-op.
diff --git a/test/tests/docker-dind/run.sh b/test/tests/docker-dind/run.sh
@@ -10,13 +10,15 @@ cid="$(
 	docker run -d -it \
 		--privileged \
 		--name "$cname" \
+		-e DOCKER_TLS_CERTDIR=/certs -v /certs \
 		"$image"
 )"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 docker_() {
 	docker run --rm -i \
 		--link "$cname":docker \
+		-e DOCKER_TLS_CERTDIR=/certs --volumes-from "$cname:ro" \
 		--entrypoint docker-entrypoint.sh \
 		"$image" \
 		"$@"
diff --git a/test/tests/docker-registry-push-pull/run.sh b/test/tests/docker-registry-push-pull/run.sh
@@ -37,6 +37,7 @@ dcid="$(
 		--privileged \
 		--link "$rcid":"$rhostname" \
 		--name "$dcname" \
+		-e DOCKER_TLS_CERTDIR=/certs -v /certs \
 		"$dockerImage" \
 		--insecure-registry "$rnamespace"
 )"
@@ -45,6 +46,7 @@ trap "docker rm -vf $rcid $dcid > /dev/null" EXIT
 docker_() {
 	docker run --rm -i \
 		--link "$dcid":docker \
+		-e DOCKER_TLS_CERTDIR=/certs --volumes-from "$dcid:ro" \
 		--entrypoint docker-entrypoint.sh \
 		"$dockerImage" \
 		"$@"
