From dac6a11564629349a277349b2177fd4896fededf Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 27 Jun 2022 20:20:50 +0200 Subject: [PATCH] feat: update to latest jenkins-agent base --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 704eff8..6edf288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -ARG BASE="4.11.2-4-alpine-jdk17-preview" +# https://github.com/containers/podman/blob/main/contrib/podmanimage/stable/Containerfile + +ARG BASE="4.13-2-alpine-jdk17-preview" FROM jenkins/inbound-agent:${BASE} @@ -34,10 +36,8 @@ RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers \ /var/lib/shared/vfs-images/images.lock /var/lib/shared/vfs-layers/layers.lock && \ mkdir /tmp/podman-run-1000 && chown $USER:$USER /tmp/podman-run-1000 && chmod 700 /tmp/podman-run-1000 && \ echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subuid && \ - echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subgid - #setcap cap_setuid=ep /usr/bin/newuidmap && \ - #setcap cap_setgid=ep /usr/bin/newgidmap && \ -RUN mkdir /workspace && \ + echo -e "$USER:1:999\n$USER:1001:64535" > /etc/subgid && \ + mkdir /workspace && \ cd /usr/bin && ln -s podman docker # Patch jenkins-agent to launch podman service