From 7a22605d2bcf5f483163045313f117b16e4085ec Mon Sep 17 00:00:00 2001 From: continuist Date: Fri, 12 Sep 2025 15:44:29 -0400 Subject: [PATCH] Fix dockerfile #2 --- ci/Dockerfile.ci-node-podman | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/Dockerfile.ci-node-podman b/ci/Dockerfile.ci-node-podman index a843362..977b51f 100644 --- a/ci/Dockerfile.ci-node-podman +++ b/ci/Dockerfile.ci-node-podman @@ -1,12 +1,12 @@ FROM node:20-bookworm-slim -# Essentials for CI steps +# essentials your CI uses RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends ca-certificates curl git jq; \ rm -rf /var/lib/apt/lists/* -# Install a recent podman-remote and alias as "podman" +# install podman remote client and expose it as "podman" ARG PODMAN_REMOTE_VERSION=5.2.3 RUN set -eux; \ arch="$(dpkg --print-architecture)"; \ @@ -15,13 +15,13 @@ RUN set -eux; \ curl -fsSL -o /tmp/podman-remote.tgz "$url"; \ mkdir -p /tmp/podman-remote; \ tar -xzf /tmp/podman-remote.tgz -C /tmp/podman-remote; \ - bin="$(find /tmp/podman-remote -type f -name podman-remote -print -quit)"; \ - test -n "$bin" || { echo "podman-remote binary not found in archive"; exit 1; }; \ - install -m 0755 "$bin" /usr/local/bin/podman-remote; \ + bin="$(find /tmp/podman-remote -type f \( -name podman-remote -o -name podman \) -perm -111 -print -quit)"; \ + test -n "$bin" || { echo "podman(-remote) binary not found in archive"; ls -R /tmp/podman-remote; exit 1; }; \ + install -m0755 "$bin" /usr/local/bin/podman-remote; \ ln -sf /usr/local/bin/podman-remote /usr/local/bin/podman; \ /usr/local/bin/podman --version; \ rm -rf /tmp/podman-remote /tmp/podman-remote.tgz -# Default to the host’s rootless socket +# defaults for your runner’s rootless socket ENV XDG_RUNTIME_DIR=/run/user/999 ENV CONTAINER_HOST=unix:///run/user/999/podman/podman.sock