From 74d0330d86023d83082de60bb35e6d70151aed52 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mitscherlich@gmail.com>
Date: Wed, 3 Sep 2025 13:16:08 +0200
Subject: [PATCH] Updated jenkins dockerfile to include docker compose

---
 create/jenkins/Dockerfile   | 28 +++++++++++++++++++++-------
 homenetwork/nas/jenkins.yml |  3 ++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/create/jenkins/Dockerfile b/create/jenkins/Dockerfile
index 3909176..89f9d59 100644
--- a/create/jenkins/Dockerfile
+++ b/create/jenkins/Dockerfile
@@ -1,12 +1,26 @@
 FROM jenkins/jenkins:lts
 USER root
+
 RUN apt-get update -qq \
-    && apt-get install -qqy apt-transport-https ca-certificates curl gnupg2 software-properties-common
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-RUN add-apt-repository \
-   "deb [arch=arm64] https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable"
+    && apt-get install -qqy \ 
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg2 \
+    software-properties-common
+
+RUN install -m 0755 -d /etc/apt/keyrings
+
+RUN curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+RUN chmod a+r /etc/apt/keyrings/docker.asc
+
+RUN echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  tee /etc/apt/sources.list.d/docker.list > /dev/null
+
 RUN apt-get update  -qq \
-    && apt-get -y install docker-ce
+    && apt-get -y install docker-ce docker-compose-plugin
 RUN usermod -aG docker jenkins
+
+
diff --git a/homenetwork/nas/jenkins.yml b/homenetwork/nas/jenkins.yml
index 0ff998c..4f7777f 100644
--- a/homenetwork/nas/jenkins.yml
+++ b/homenetwork/nas/jenkins.yml
@@ -8,7 +8,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /usr/bin/docker:/usr/bin/docker
       - /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/jenkins/:/var/jenkins_home
-      - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins_workspace:/var/jenkins_home/workspace
+      - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/workspace:/var/jenkins_home/workspace
+      - /srv/dev-disk-by-uuid-7a33692e-6462-435b-9c97-029589baeeab/jenkins/jobs:/var/jenkins_home/jobs
     ports:
       - "8080:8080"
       - "50000:50000"