fix: Fix trivy, config location

fix: Adjust things to new HOME location
fix: Remove HOME env as it is set by default ZDT Jenkins config
2024-06-25 17:10:00 +00:00 · 2024-06-25 16:35:37 +00:00 · 2024-06-25 15:48:16 +00:00 · 2024-06-25 15:47:10 +00:00 · 2024-06-23 03:04:12 +00:00 · 2024-06-14 13:50:23 +00:00
3 changed files with 9 additions and 4 deletions
--- a/9
+++ b/9
@ -2,7 +2,7 @@
 # https://hub.docker.com/r/jenkins/inbound-agent/tags


-FROM jenkins/inbound-agent:alpine-jdk17@sha256:17871822cee8a77b6a46e5f293f19c16bcd93074520b7789c7057bfbbb7423c1
+FROM jenkins/inbound-agent:alpine-jdk21@sha256:a7e633f06d8a1af720e30cd5421b8ba58230ec34af250a07d61cba0df88c587b

 ARG BUILDUSER=jenkins

@ -41,9 +41,14 @@ 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=""
-ENV HOME=/home/$BUILDUSER
+
+# Until we setup the logging and metrics pipelines in OTEL
+ENV OTEL_LOGS_EXPORTER=none
+ENV OTEL_METRICS_EXPORTER=none

 USER $BUILDUSER

--- a/2
+++ b/2
@ -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', trivyFail: 'NONE'
+buildPodman name: 'jenkins-podman'
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -1,4 +1,4 @@
 #!/bin/sh

-mkdir -p $HOME/agent/xdg-run $HOME/agent/containers/run $HOME/agent/containers/storage
+mkdir -p $HOME/xdg-run $HOME/containers/run $HOME/containers/storage
 /usr/local/bin/jenkins-agent
Author	SHA1	Message	Date
Stefan Reimer	16dcaef4f7	fix: Fix trivy, config location All checks were successful ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details ZeroDownTime/jenkins-podman/pipeline/tag This commit looks good Details	2024-06-25 17:10:00 +00:00
Stefan Reimer	2579cc7f00	fix: Adjust things to new HOME location Some checks failed ZeroDownTime/jenkins-podman/pipeline/head There was a failure building this commit Details	2024-06-25 16:35:37 +00:00
Stefan Reimer	5d782faa02	fix: Remove HOME env as it is set by default ZDT Jenkins config Some checks failed ZeroDownTime/jenkins-podman/pipeline/head There was a failure building this commit Details	2024-06-25 15:48:16 +00:00
Stefan Reimer	7bd5dc4093	Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk21 docker digest to a7e633f' (#9 ) from renovate/jenkins-inbound-agent-alpine-jdk21 into master Some checks failed ZeroDownTime/jenkins-podman/pipeline/head There was a failure building this commit Details Reviewed-on: #9	2024-06-25 15:47:10 +00:00
Renovate Bot	33d242f69a	chore(deps): update jenkins/inbound-agent:alpine-jdk21 docker digest to a7e633f Some checks failed ZeroDownTime/jenkins-podman/pipeline/pr-master There was a failure building this commit Details	2024-06-23 03:04:12 +00:00
Stefan Reimer	f7fcfd53ad	chore: latest Jenkins base image All checks were successful ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details ZeroDownTime/jenkins-podman/pipeline/tag This commit looks good Details	2024-06-14 13:50:23 +00:00
Stefan Reimer	6de66df1a9	Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 38484c0' (#7 ) from renovate/jenkins-inbound-agent-alpine-jdk17 into master All checks were successful ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details Reviewed-on: #7	2024-04-15 15:09:09 +00:00
Stefan Reimer	dbdc24fe53	fix: Ensure only traces are sent via OTEL for now All checks were successful ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details	2024-04-15 14:51:31 +00:00
Renovate Bot	bda8c643c6	chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 38484c0 All checks were successful ZeroDownTime/jenkins-podman/pipeline/pr-master This commit looks good Details	2024-04-03 03:05:51 +00:00