Compare commits

..

No commits in common. "master" and "v0.5.0" have entirely different histories.

3 changed files with 4 additions and 9 deletions

View File

@ -2,7 +2,7 @@
# https://hub.docker.com/r/jenkins/inbound-agent/tags # https://hub.docker.com/r/jenkins/inbound-agent/tags
FROM jenkins/inbound-agent:alpine-jdk21@sha256:a7e633f06d8a1af720e30cd5421b8ba58230ec34af250a07d61cba0df88c587b FROM jenkins/inbound-agent:alpine-jdk17@sha256:17871822cee8a77b6a46e5f293f19c16bcd93074520b7789c7057bfbbb7423c1
ARG BUILDUSER=jenkins ARG BUILDUSER=jenkins
@ -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 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_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
ENV XDG_CONFIG_HOME=/home/$BUILDUSER/.config
ENV BUILDAH_ISOLATION=chroot ENV BUILDAH_ISOLATION=chroot
ENV _CONTAINERS_USERNS_CONFIGURED="" 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 USER $BUILDUSER

2
Jenkinsfile vendored
View File

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

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/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 /usr/local/bin/jenkins-agent