From c559a32d2c5d0666607a18bb9e120c0383ec0ec5 Mon Sep 17 00:00:00 2001
From: Claude AI <claude@thedevops.dev>
Date: Mon, 5 Jan 2026 17:54:11 +0000
Subject: [PATCH] fix(jenkins): Use separate init containers for docker and
 kubectl installation

---
 apps/jenkins/deployment.yaml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/apps/jenkins/deployment.yaml b/apps/jenkins/deployment.yaml
index edbe39e..7e7a209 100644
--- a/apps/jenkins/deployment.yaml
+++ b/apps/jenkins/deployment.yaml
@@ -16,22 +16,30 @@ spec:
       securityContext:
         fsGroup: 1000
       initContainers:
-      - name: install-tools
+      - name: install-docker
+        image: docker:24-cli
+        command:
+        - sh
+        - -c
+        - |
+          echo "Installing Docker CLI..."
+          cp /usr/local/bin/docker /tmp/tools-bin/
+          chmod +x /tmp/tools-bin/docker
+          echo "✅ Docker CLI installed"
+        volumeMounts:
+        - name: tools-bin
+          mountPath: /tmp/tools-bin
+      - name: install-kubectl
         image: alpine:3.19
         command:
         - sh
         - -c
         - |
-          # Install Docker CLI
-          apk add --no-cache docker-cli
-          cp /usr/bin/docker /tmp/tools-bin/
-          
-          # Install kubectl
-          wget -O /tmp/tools-bin/kubectl "https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl"
+          echo "Installing kubectl..."
+          wget -q -O /tmp/tools-bin/kubectl "https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl"
           chmod +x /tmp/tools-bin/kubectl
-          
-          echo "✅ Docker and kubectl installed"
-          ls -la /tmp/tools-bin/
+          echo "✅ kubectl installed"
+          ls -lh /tmp/tools-bin/
         volumeMounts:
         - name: tools-bin
           mountPath: /tmp/tools-bin
@@ -51,6 +59,9 @@ spec:
         - -c
         - |
           export PATH="/tmp/tools-bin:$PATH"
+          echo "PATH: $PATH"
+          which docker || echo "Docker not in PATH"
+          which kubectl || echo "kubectl not in PATH"
           exec /usr/local/bin/jenkins.sh
         volumeMounts:
         - name: jenkins-home