Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker #14016

Merged
merged 1 commit into from
Feb 3, 2023
Merged

Update docker #14016

merged 1 commit into from
Feb 3, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 3, 2023

Changes:

Changes:

- docker-library/docker@0d1c210: Merge pull request docker-library/docker#398 from infosiftr/complex-expressions
- docker-library/docker@38e13c8: prevent tls being disabled if _tls_generate_certs fails
@github-actions
Copy link

github-actions bot commented Feb 3, 2023

Diff for eab00bc:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7a471b4..d172a87 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,7 +8,7 @@ Directory: 20.10/cli
 
 Tags: 20.10.23-dind, 20.10-dind, 20-dind, 20.10.23-dind-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 4abc6d9dadc3876b11aac5abf84d501d7ee0d318
+GitCommit: 38e13c81eb5cb5b10d4477467547b0823d877720
 Directory: 20.10/dind
 
 Tags: 20.10.23-dind-rootless, 20.10-dind-rootless, 20-dind-rootless
@@ -42,7 +42,7 @@ Directory: 23.0/cli
 
 Tags: 23.0.0-dind, 23.0-dind, 23-dind, dind, 23.0.0-dind-alpine3.17, 23.0.0, 23.0, 23, latest, 23.0.0-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 849b56e6c81dc509da780121352f844e8f26bb7a
+GitCommit: 38e13c81eb5cb5b10d4477467547b0823d877720
 Directory: 23.0/dind
 
 Tags: 23.0.0-dind-rootless, 23.0-dind-rootless, 23-dind-rootless, dind-rootless
diff --git a/docker_20.10.23-dind-alpine3.17/dockerd-entrypoint.sh b/docker_20.10.23-dind-alpine3.17/dockerd-entrypoint.sh
index 38bc262..caf3823 100755
--- a/docker_20.10.23-dind-alpine3.17/dockerd-entrypoint.sh
+++ b/docker_20.10.23-dind-alpine3.17/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" \
diff --git a/docker_23.0.0-alpine3.17/dockerd-entrypoint.sh b/docker_23.0.0-alpine3.17/dockerd-entrypoint.sh
index 38bc262..caf3823 100755
--- a/docker_23.0.0-alpine3.17/dockerd-entrypoint.sh
+++ b/docker_23.0.0-alpine3.17/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" \

Relevant Maintainers:

@yosifkit yosifkit merged commit f6f4f8a into docker-library:master Feb 3, 2023
@yosifkit yosifkit deleted the docker branch February 3, 2023 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants