Skip to content

Commit 38e13c8

Browse files
committed
prevent tls being disabled if _tls_generate_certs fails
1 parent 0acd507 commit 38e13c8

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

20.10/dind/dockerd-entrypoint.sh

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

23.0/dind/dockerd-entrypoint.sh

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dockerd-entrypoint.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,11 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
108108
esac
109109

110110
# add our default arguments
111-
if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \
112-
&& _tls_generate_certs "$DOCKER_TLS_CERTDIR" \
113-
&& [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \
114-
&& [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \
115-
&& [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \
116-
; then
111+
if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then
112+
_tls_generate_certs "$DOCKER_TLS_CERTDIR"
113+
[ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ]
114+
[ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ]
115+
[ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ]
117116
# generate certs and use TLS if requested/possible (default in 19.03+)
118117
set -- dockerd \
119118
--host="$dockerSocket" \

0 commit comments

Comments
 (0)