Merge branch 'master' of https://git.mitscherlich.nl/private/docker-swarm

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
+
+

homenetwork/nas/jenkins.yml

@@ -2,13 +2,14 @@ services:
   jenkins:
     container_name: jenkins
     restart: unless-stopped
-    image: jenkins/jenkins:lts
+    image: registry.vbchaos.nl/jenkins-docker
     user: root
     volumes:
       - /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"

homenetwork/nas/nextcloud/nc/Dockerfile

@@ -6,7 +6,11 @@ ARG GID=1000
 #RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid 82 www-data
 RUN usermod -u $UID -o www-data
 RUN apt update \
-    && apt -y install libmagickcore-6.q16-6-extra ffmpeg imagemagick ghostscript \
+    && apt -y install \
+#    libmagickcore-6.q16-6-extra \
+    ffmpeg \
+    imagemagick \
+    ghostscript \
     && apt clean
 
 # Add custom cron job for previews

homenetwork/nas/nextcloud/start.sh

@@ -1,3 +1,3 @@
-MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose build --no-cache
-MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose up -d --force-recreate
+MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker compose build --no-cache
+MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker compose up -d --force-recreate