From c5e9f059f4700f5092658e4693ab9e122de3ba28 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Mon, 25 Aug 2025 21:01:08 +0000
Subject: [PATCH] Updated for the new environment
---
Dockerfile | 8 ++++----
docker-compose.yml | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d143f54..3932dc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
#Leave this at jdk 11 That is the highest so far for jenkins
-FROM openjdk:11
+FROM openjdk:21-bookworm
ENV JENKINS_PORT=8080
ENV JENKINS_HOME=/var/jenkins_home
ENV JENKINS_SLAVE_AGENT_PORT=50000
-ENV JENKINS_UID=506
+ENV JENKINS_UID=1002
RUN mkdir -p /tmp/download && cd /tmp/download/ && \
apt-get update && apt-get upgrade -y && apt-get install curl git -y && apt-get clean && \
- curl -s -L https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz | tar -xz -C /tmp/download && \
+ curl -s -L https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz | tar -xz -C /tmp/download && \
rm -rf /tmp/download/docker/dockerd && \
mv /tmp/download/docker/docker* /usr/local/bin/ && \
rm -rf /tmp/download
@@ -27,6 +27,6 @@
RUN chown -R "${JENKINS_UID}" "${JENKINS_HOME}" && \
chmod -R g+w "${JENKINS_HOME}"
-USER 506
+USER ${JENKINS_UID}
CMD java -jar -Xmx512m -Xms256m /opt/jenkins/jenkins.war --prefix=$PREFIX --httpPort="${JENKINS_PORT}" -Djava.awt.headless=true
diff --git a/docker-compose.yml b/docker-compose.yml
index 555cf8c..4a81ae9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@
services:
jenkins:
- image: dev-reg.darkurthe.net/jenkins:2023-05-19-build-214
+ image: dev-reg.darkurthe.net/jenkins:latest
networks:
agents:
aliases:
@@ -21,6 +21,7 @@
options:
max-size: "10m"
max-file: "3"
+ user: 1002:1002
deploy:
placement:
constraints:
@@ -48,5 +49,5 @@
driver: local
driver_opts:
type: nfs
- o: addr=zombienas.darkurthe.net,rw,async,hard,intr,nfsvers=4
- device: ":/jenkins_home"
+ o: addr=goblin-hoard.darkurthe.net,rw,async,hard,intr,nfsvers=4
+ device: ":/config/jenkins"
--
Gitblit v1.10.0