Merge pull request #398 from infosiftr/complex-expressions

prevent tls being disabled if _tls_generate_certs fails
docker-library · Feb 3, 2023 · 0d1c210 · 0d1c210
2 parents 0acd507 + 38e13c8
commit 0d1c210
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh
diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh
diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh
@@ -108,12 +108,11 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
 	esac
 
 	# add our default arguments
-	if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \
-		&& _tls_generate_certs "$DOCKER_TLS_CERTDIR" \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \
-		&& [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \
-	; then
+	if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then
+		_tls_generate_certs "$DOCKER_TLS_CERTDIR"
+		[ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ]
+		[ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ]
+		[ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ]
 		# generate certs and use TLS if requested/possible (default in 19.03+)
 		set -- dockerd \
 			--host="$dockerSocket" \