ZeroDownTime/jenkins-podman
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

feat: latest agent and Alpine, add detect-secrets

Browse Source
This commit is contained in:
Stefan Reimer 2022-10-13 13:28:01 +02:00
parent 21748adf93
commit 5fa1eb19c3
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Dockerfile
View File

@ -1,47 +1,53 @@
# https://github.com/containers/podman/blob/main/contrib/podmanimage/stable/Containerfile # https://github.com/containers/podman/blob/main/contrib/podmanimage/stable/Containerfile
# https://hub.docker.com/r/jenkins/inbound-agent/tags
ARG BASE="4.13.2-1-alpine-jdk17-preview" ARG BASE="alpine-jdk17"
FROM jenkins/inbound-agent:${BASE} FROM jenkins/inbound-agent:${BASE}
ARG USER=jenkins ARG BUILDUSER=jenkins
USER root USER root
RUN apk upgrade -U --available --no-cache && apk add --no-cache \ RUN echo "@edge-testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
tini \ apk upgrade -U --available --no-cache && \
make \ apk add --no-cache \
yq \ tini \
strace \ make \
podman \ yq \
buildah \ strace \
aws-cli podman \
buildah \
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \ py3-pip \
apk upgrade -U --available --no-cache && apk add --no-cache \ aws-cli \
trivy trivy@edge-testing
# Trivy html template # Trivy html template
ADD --chown=$USER:$USER html.tpl /home/$USER ADD --chown=$BUILDUSER:$BUILDUSER html.tpl /home/$BUILDUSER
# Rootless podman # Rootless podman
RUN mkdir -p /home/$USER/.config/containers RUN mkdir -p /home/$BUILDUSER/.config/containers
ADD entrypoint.sh /usr/local/bin/entrypoint.sh ADD entrypoint.sh /usr/local/bin/entrypoint.sh
ADD --chown=$USER:$USER conf/containers.conf conf/registries.conf conf/storage.conf /home/$USER/.config/containers # 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 "$USER:1:999\n$USER:1001:64535" > /etc/subuid && \ RUN echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subuid && \
echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subgid && \ echo -e "$BUILDUSER:1:999\n$BUILDUSER:1001:64535" > /etc/subgid && \
cd /usr/bin && ln -s podman docker && \ cd /usr/bin && ln -s podman docker && \
chown $USER:$USER -R /home/$USER chown $BUILDUSER:$BUILDUSER -R /home/$BUILDUSER
# Patch jenkins-agent to launch podman service # Patch jenkins-agent to launch podman service
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/$USER/agent/xdg-run ENV XDG_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
ENV BUILDAH_ISOLATION=chroot ENV BUILDAH_ISOLATION=chroot
ENV _CONTAINERS_USERNS_CONFIGURED="" ENV _CONTAINERS_USERNS_CONFIGURED=""
ENV TRIVY_TEMPLATE="@/home/jenkins/html.tpl" ENV TRIVY_TEMPLATE="@/home/jenkins/html.tpl"
USER $USER USER $BUILDUSER
# Install detect-secrets
ENV PATH=$PATH:/home/${BUILDUSER}/.local/bin
RUN pip install detect-secrets --user
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]

2
conf/registries.conf
View File

@ -1,2 +0,0 @@
# Note that changing the order here may break lazy devs Dockerfile
unqualified-search-registries = [ "gcr.io", "quay.io", "docker.io", "registry.fedoraproject.org"]