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

Reviewed-on: #7
fix: Ensure only traces are sent via OTEL for now
2024-04-15 15:09:09 +00:00 · 2024-04-15 14:51:31 +00:00 · 2024-04-03 03:05:51 +00:00 · 2024-03-12 15:58:19 +00:00 · 2024-03-12 15:57:25 +00:00 · 2024-03-12 03:19:02 +00:00
2 changed files with 10 additions and 3 deletions
--- a/.ci/vars/buildPodman.groovy
+++ b/.ci/vars/buildPodman.groovy
@ -2,6 +2,9 @@

 def call(Map config=[:]) {
    pipeline {
+      options {
+        disableConcurrentBuilds()
+      }
      agent {
        node {
          label 'podman-aws-trivy'
--- a/10
+++ b/10
@ -2,7 +2,7 @@
 # https://hub.docker.com/r/jenkins/inbound-agent/tags


-FROM jenkins/inbound-agent:alpine-jdk17@sha256:4f78d4832acacddf3573b1095770f672ac0b2a76432002f9ade707e302f96a12
+FROM jenkins/inbound-agent:alpine-jdk17@sha256:38484c0f035a57b3cab5838468fb6c5c2b3f3051e7a2c8b39c99a30823f393ce

 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:1:999\n$BUILDUSER:1001:64535" > /etc/subuid && \
-    echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subgid && \
+RUN echo -e "$BUILDUSER:100000:65535" > /etc/subuid && \
+    echo -e "$BUILDUSER:100000:65535" > /etc/subgid && \
    cd /usr/bin && ln -s podman docker && \
    chown $BUILDUSER:$BUILDUSER -R /home/$BUILDUSER

@ -45,6 +45,10 @@ 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

 ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]
Author	SHA1	Message	Date
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 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 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 ZeroDownTime/jenkins-podman/pipeline/pr-master This commit looks good Details	2024-04-03 03:05:51 +00:00
Stefan Reimer	4161f32529	fix: subuid cleanup ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details ZeroDownTime/jenkins-podman/pipeline/tag This commit looks good Details	2024-03-12 15:58:19 +00:00
Stefan Reimer	d504595922	Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 1787182' (#6 ) from renovate/jenkins-inbound-agent-alpine-jdk17 into master ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details Reviewed-on: #6	2024-03-12 15:57:25 +00:00
Renovate Bot	a270f8481e	chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 1787182 ZeroDownTime/jenkins-podman/pipeline/pr-master This commit looks good Details	2024-03-12 03:19:02 +00:00
Stefan Reimer	c7bc209fd8	Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 3452960' (#5 ) from renovate/jenkins-inbound-agent-alpine-jdk17 into master ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details ZeroDownTime/jenkins-podman/pipeline/tag This commit looks good Details Reviewed-on: #5	2023-12-14 12:53:41 +00:00
Renovate Bot	1c02becff6	chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to 3452960 ZeroDownTime/jenkins-podman/pipeline/pr-master This commit looks good Details	2023-12-05 03:09:08 +00:00
Stefan Reimer	2a2081b01b	Merge latest ci-tools-lib ZeroDownTime/jenkins-podman/pipeline/head This commit looks good Details	2023-11-23 12:31:40 +00:00
Stefan Reimer	ab32348082	Squashed '.ci/' changes from 7144a42..2c44e4f 2c44e4f Disable concurrent builds git-subtree-dir: .ci git-subtree-split: 2c44e4fd8550d30fba503a2bcccec8e0bac1c151	2023-11-23 12:31:40 +00:00
Stefan Reimer	aa92aa43c1	Merge pull request 'chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to d261fad' (#4 ) from renovate/jenkins-inbound-agent-alpine-jdk17 into master ZeroDownTime/jenkins-podman/pipeline/head There was a failure building this commit Details Reviewed-on: #4	2023-11-23 12:29:05 +00:00
Renovate Bot	1ec7cd94e2	chore(deps): update jenkins/inbound-agent:alpine-jdk17 docker digest to d261fad ZeroDownTime/jenkins-podman/pipeline/pr-master This commit looks good Details	2023-11-14 03:10:33 +00:00