Dockerfile

@@ -2,7 +2,7 @@
 # https://hub.docker.com/r/jenkins/inbound-agent/tags
 
 
-FROM jenkins/inbound-agent:alpine-jdk21@sha256:a7e633f06d8a1af720e30cd5421b8ba58230ec34af250a07d61cba0df88c587b
+FROM jenkins/inbound-agent:alpine-jdk17@sha256:3452960784c5b0a32cdd7cab20d23341f8a480d6783f567d565f5c0c7aa0418a
 
 ARG BUILDUSER=jenkins
 
@@ -32,8 +32,8 @@ ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 # conf/registries.conf will be mounted RO at runtime to inherit worker settings incl. caching proxies
 ADD --chown=$BUILDUSER:$BUILDUSER conf/containers.conf conf/storage.conf /home/$BUILDUSER/.config/containers
 
-RUN echo -e "$BUILDUSER:100000:65535" > /etc/subuid && \
-    echo -e "$BUILDUSER:100000:65535" > /etc/subgid && \
+RUN echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subuid && \
+    echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subgid && \
     cd /usr/bin && ln -s podman docker && \
     chown $BUILDUSER:$BUILDUSER -R /home/$BUILDUSER
 
@@ -41,14 +41,9 @@ RUN echo -e "$BUILDUSER:100000:65535" > /etc/subuid && \
 RUN sed -i -e 's/exec \$JAVA_BIN/podman system service -t0\&\n        exec \$JAVA_BIN/' /usr/local/bin/jenkins-agent
 
 ENV XDG_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
-ENV XDG_CONFIG_HOME=/home/$BUILDUSER/.config
-
 ENV BUILDAH_ISOLATION=chroot
 ENV _CONTAINERS_USERNS_CONFIGURED=""
-
-# Until we setup the logging and metrics pipelines in OTEL
-ENV OTEL_LOGS_EXPORTER=none
-ENV OTEL_METRICS_EXPORTER=none
+ENV HOME=/home/$BUILDUSER
 
 USER $BUILDUSER
 

Jenkinsfile

@@ -2,4 +2,4 @@ library identifier: 'zdt-lib@master', retriever: modernSCM(
   [$class: 'GitSCMSource',
    remote: 'https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git'])
 
-buildPodman name: 'jenkins-podman'
+buildPodman name: 'jenkins-podman', trivyFail: 'NONE'

entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-mkdir -p $HOME/xdg-run $HOME/containers/run $HOME/containers/storage
+mkdir -p $HOME/agent/xdg-run $HOME/agent/containers/run $HOME/agent/containers/storage
 /usr/local/bin/jenkins-agent