From 60887a9e3f6f9320160369d9ab8ebccffe4b8925 Mon Sep 17 00:00:00 2001
From: continuist <continuist02@gmail.com>
Date: Fri, 12 Sep 2025 15:35:57 -0400
Subject: [PATCH] Fix dockerfile

---
 ci/Dockerfile.ci-node-podman | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/ci/Dockerfile.ci-node-podman b/ci/Dockerfile.ci-node-podman
index 934a578..a843362 100644
--- a/ci/Dockerfile.ci-node-podman
+++ b/ci/Dockerfile.ci-node-podman
@@ -2,23 +2,26 @@ FROM node:20-bookworm-slim
 
 # Essentials for CI steps
 RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends ca-certificates curl git jq; \
-    rm -rf /var/lib/apt/lists/*
+  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 (static binary), and alias it as "podman"
+# Install a recent podman-remote and alias as "podman"
 ARG PODMAN_REMOTE_VERSION=5.2.3
 RUN set -eux; \
-    arch="$(dpkg --print-architecture)"; case "$arch" in \
-      amd64) goarch=amd64;; arm64) goarch=arm64;; \
-      *) echo "unsupported arch: $arch"; exit 1;; \
-    esac; \
-    curl -fsSL -o /tmp/podman-remote.tgz \
-      "https://github.com/containers/podman/releases/download/v${PODMAN_REMOTE_VERSION}/podman-remote-static-linux_${goarch}.tar.gz"; \
-    tar -C /usr/local/bin -xzf /tmp/podman-remote.tgz podman-remote; \
-    ln -s /usr/local/bin/podman-remote /usr/local/bin/podman; \
-    /usr/local/bin/podman --version
+  arch="$(dpkg --print-architecture)"; \
+  case "$arch" in amd64) goarch=amd64;; arm64) goarch=arm64;; *) echo "unsupported arch: $arch"; exit 1;; esac; \
+  url="https://github.com/containers/podman/releases/download/v${PODMAN_REMOTE_VERSION}/podman-remote-static-linux_${goarch}.tar.gz"; \
+  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; \
+  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
 
-# Defaults that make the client talk to your host’s rootless socket
+# Default to the host’s rootless socket
 ENV XDG_RUNTIME_DIR=/run/user/999
-ENV CONTAINER_HOST=unix:///run/user/999/podman/podman.sock
\ No newline at end of file
+ENV CONTAINER_HOST=unix:///run/user/999/podman/podman.sock