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

fix: remove dockerd as args in runner controller #432

Merged
merged 1 commit into from
Mar 31, 2021

Conversation

cbrand
Copy link
Contributor

@cbrand cbrand commented Mar 31, 2021

This fixes #431

Succesfully tested on a with the default runner image. It enables creation of the necessary docker certificates.

@@ -703,7 +703,6 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
pod.Spec.Containers = append(pod.Spec.Containers, corev1.Container{
Name: "docker",
Image: r.DockerImage,
Args: []string{"dockerd"},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I'm wondering if removing this breaks dockerMTU handling at L733. Let me check

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind. This looks OK seeing

https://github.com/docker-library/docker/blob/b1d2628005e12e79079c025c3653cba248d6f264/19.03/dind/dockerd-entrypoint.sh#L94

vs

https://github.com/docker-library/docker/blob/b1d2628005e12e79079c025c3653cba248d6f264/19.03/dind/dockerd-entrypoint.sh#L137

With Args: []string{"dockerd"}, we go to the latter where default options that includes docker certs dirs are not set.

Without that we go to the former path where default options exists as before.

Copy link
Collaborator

@mumoshu mumoshu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thank you so much for fixing it @cbrand!

@mumoshu mumoshu merged commit 9ed245c into actions:master Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: external docker container with v0.18.1 doesn't work
2 participants