From 5e3f89bdc5071827e259d64fab843ec5767b5db7 Mon Sep 17 00:00:00 2001 From: Tristan Keen Date: Fri, 24 Sep 2021 01:18:20 +0100 Subject: [PATCH] Correct test to append docker container (#837) Fixes #835 --- controllers/runner_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index 845a95f4..1c95482c 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -619,7 +619,7 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) { Resources: runner.Spec.Resources, }) - if runner.Spec.DockerdWithinRunnerContainer == nil || !*runner.Spec.DockerdWithinRunnerContainer { + if (runner.Spec.DockerEnabled == nil || *runner.Spec.DockerEnabled) && (runner.Spec.DockerdWithinRunnerContainer == nil || !*runner.Spec.DockerdWithinRunnerContainer) { template.Spec.Containers = append(template.Spec.Containers, corev1.Container{ Name: "docker", VolumeMounts: runner.Spec.DockerVolumeMounts,