commit c9eac5ed44e6178c7a949370ba87c1203e169902 parent 948ecb35cd2190b5d08fca17fca0e1b75335d209 Author: Andreas Gruhler <agruhl@gmx.ch> Date: Sun, 24 Aug 2025 11:03:07 +0200 feat(jenkins-agent): use latest alpine img Diffstat:
| M | docker/docker-jenkins-inbound-agent/Dockerfile | | | 33 | ++++++++++++++++----------------- |
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/docker/docker-jenkins-inbound-agent/Dockerfile b/docker/docker-jenkins-inbound-agent/Dockerfile @@ -24,28 +24,27 @@ # https://github.com/jenkinsci/docker-agent/blob/master/alpine/Dockerfile # https://github.com/jenkinsci/docker-inbound-agents/blob/master/docker/Dockerfile -ARG ALPINE_TAG=3.22.1 - ## Agent image target -FROM docker.io/alpine:"${ALPINE_TAG}" AS agent +FROM docker.io/alpine:latest AS agent -ARG JAVA_VERSION="24.0.2" ARG user=jenkins ARG group=jenkins ARG uid=1000 ARG gid=1000 -ARG AGENT_WORKDIR=/home/"${user}"/agent +ARG AGENT_WORKDIR="/home/${user}/agent" RUN addgroup -g "${gid}" "${group}" -RUN adduser -h /home/"${user}" -u "${uid}" -G "${group}" -D "${user}" +RUN adduser -h "/home/${user}" -u "${uid}" -G "${group}" -D "${user}" ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' ENV TZ=Etc/UTC RUN apk update && apk add --no-cache \ - curl bash git git-lfs musl-locales \ - openssh-client openssl procps tzdata tzdata-utils -RUN apk add openjdk24 --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing + curl bash git git-lfs musl-locales openssh-client openssl \ + procps tzdata tzdata-utils + +RUN apk add openjdk24 \ + --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing # Download Jenkins remoting agent ARG VERSION=3327.v868139a_d00e0 @@ -55,20 +54,20 @@ RUN chmod 0644 /usr/share/jenkins/agent.jar \ USER "${user}" ENV AGENT_WORKDIR="${AGENT_WORKDIR}" -RUN mkdir -p /home/"${user}"/.jenkins && mkdir -p "${AGENT_WORKDIR}" +RUN mkdir -p "/home/${user}/.jenkins" && mkdir -p "${AGENT_WORKDIR}" -VOLUME /home/"${user}"/.jenkins +VOLUME "/home/${user}/.jenkins" VOLUME "${AGENT_WORKDIR}" -WORKDIR /home/"${user}" -ENV user=${user} +WORKDIR "/home/${user}" +ENV user="${user}" ## Inbound Agent image target FROM agent AS inbound-agent USER root -# We emulate docker command for docker-workflow Jenkins plugin -# and install buildah to build and push containers. +# Install docker command for docker-workflow Jenkins plugin and buildah to +# build and push containers. RUN apk add --no-cache docker buildah netavark # Set up environment variables to note that this is not starting with user @@ -85,8 +84,8 @@ ENV STORAGE_DRIVER=vfs # Configure missing subuid/subgids for rootless podman builds # https://docs.podman.io/en/latest/markdown/podman.1.html#rootless-mode -RUN echo jenkins:10000:65536 >> /etc/subuid -RUN echo jenkins:10000:65536 >> /etc/subgid +RUN echo "${user}:10000:65536" >> /etc/subuid +RUN echo "${user}:10000:65536" >> /etc/subgid USER ${user}