Skip to content

Commit 5269d09

Browse files
committed
Support podman
1 parent 542dccb commit 5269d09

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

ic-os/api-bn-recovery/build.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ IC_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
66
IMAGE_NAME="${IMAGE_NAME:-api-boundary-node}"
77
IMAGE_TAG="${IMAGE_TAG:-latest}"
88

9+
# Use docker if available, fall back to podman
10+
if command -v docker &>/dev/null; then
11+
CONTAINER_CMD=docker
12+
elif command -v podman &>/dev/null; then
13+
CONTAINER_CMD=podman
14+
else
15+
echo "ERROR: Neither docker nor podman found."
16+
exit 1
17+
fi
18+
919
echo "============================================"
1020
echo " Building API Boundary Node Docker Image"
1121
echo "============================================"
@@ -33,7 +43,7 @@ trap cleanup_artifacts EXIT
3343

3444
echo "[3/4] Building Docker image..."
3545
cd "${SCRIPT_DIR}"
36-
docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
46+
$CONTAINER_CMD build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
3747

3848
echo "[4/4] Cleaning up build artifacts..."
3949
cleanup_artifacts

ic-os/api-bn-recovery/test.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,19 @@ IMAGE_NAME="api-boundary-node"
1010
IMAGE_TAG="test"
1111
MAX_WAIT=300 # 5 minutes for registry sync + replica discovery
1212

13+
# Use docker if available, fall back to podman
14+
if command -v docker &>/dev/null; then
15+
CONTAINER_CMD=docker
16+
elif command -v podman &>/dev/null; then
17+
CONTAINER_CMD=podman
18+
else
19+
echo "ERROR: Neither docker nor podman found."
20+
exit 1
21+
fi
22+
1323
cleanup() {
1424
echo "Cleaning up..."
15-
docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
25+
$CONTAINER_CMD rm -f "$CONTAINER_NAME" 2>/dev/null || true
1626
}
1727
trap cleanup EXIT
1828

@@ -29,16 +39,16 @@ IMAGE_NAME="$IMAGE_NAME" IMAGE_TAG="$IMAGE_TAG" "${SCRIPT_DIR}/build.sh"
2939

3040
# ─── Run ───
3141
echo "=== Starting container ==="
32-
docker run -d --name "$CONTAINER_NAME" --network host "${IMAGE_NAME}:${IMAGE_TAG}"
42+
$CONTAINER_CMD run -d --name "$CONTAINER_NAME" --network host "${IMAGE_NAME}:${IMAGE_TAG}"
3343

3444
# ─── Wait for readiness ───
3545
echo "=== Waiting for boundary node to become ready (up to ${MAX_WAIT}s) ==="
3646
WAITED=0
3747
while true; do
3848
# Check container is still running
39-
if ! docker inspect --format='{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null | grep -q true; then
49+
if ! $CONTAINER_CMD inspect --format='{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null | grep -q true; then
4050
echo "FAIL: Container exited unexpectedly."
41-
docker logs "$CONTAINER_NAME" 2>&1 | tail -30
51+
$CONTAINER_CMD logs "$CONTAINER_NAME" 2>&1 | tail -30
4252
exit 1
4353
fi
4454

@@ -50,7 +60,7 @@ while true; do
5060

5161
if [ "$WAITED" -ge "$MAX_WAIT" ]; then
5262
echo "FAIL: Boundary node did not become healthy within ${MAX_WAIT}s."
53-
docker logs "$CONTAINER_NAME" 2>&1 | tail -30
63+
$CONTAINER_CMD logs "$CONTAINER_NAME" 2>&1 | tail -30
5464
exit 1
5565
fi
5666

0 commit comments

Comments
 (0)