From 5a2116909d14b97bbc9d426c1df3c65cebdfbf4f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Mar 2024 20:44:31 +0100
Subject: build-alpine.sh: use podman build.

---
 Containerfile.alpine | 20 ++++++++++++++++++++
 Dockerfile.alpine    | 16 ----------------
 build-alpine.sh      |  4 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 Containerfile.alpine
 delete mode 100644 Dockerfile.alpine

diff --git a/Containerfile.alpine b/Containerfile.alpine
new file mode 100644
index 0000000..57205f9
--- /dev/null
+++ b/Containerfile.alpine
@@ -0,0 +1,20 @@
+FROM alpine:latest
+
+RUN apk update \
+    && apk --no-cache --update add build-base
+
+WORKDIR /work
+
+COPY nitro.c .
+COPY nitroctl.c .
+COPY Makefile .
+
+RUN make CFLAGS="-Os -Wl,--gc-sections -fno-asynchronous-unwind-tables -fno-stack-protector -fno-stack-clash-protection" LDFLAGS="-static"
+
+VOLUME /out
+
+RUN nm --size-sort nitro
+RUN ls -l nitro nitroctl
+RUN size nitro nitroctl
+
+RUN cp nitro nitroctl /out
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
deleted file mode 100644
index a16b827..0000000
--- a/Dockerfile.alpine
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM alpine:latest
-
-RUN apk update \
-    && apk --no-cache --update add build-base
-
-WORKDIR /bin.alpine
-
-COPY nitro.c .
-COPY nitroctl.c .
-COPY Makefile .
-
-RUN make CFLAGS="-Os -Wl,--gc-sections -fno-asynchronous-unwind-tables -fno-stack-protector -fno-stack-clash-protection" LDFLAGS="-static"
-
-RUN nm --size-sort nitro
-RUN ls -l nitro nitroctl
-RUN size nitro nitroctl
diff --git a/build-alpine.sh b/build-alpine.sh
index fe5e4cb..c5eee3e 100755
--- a/build-alpine.sh
+++ b/build-alpine.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 rm -rf bin.alpine
-docker build -f Dockerfile.alpine --progress=plain --iidfile=id.alpine .
-docker save $(cat id.alpine) | bsdtar xO '*/layer.tar' | bsdtar xv --ignore-zeros bin.alpine/nitro bin.alpine/nitroctl
+mkdir bin.alpine
+podman build -f Containerfile.alpine -v $PWD/bin.alpine:/out:Z
-- 
cgit 1.4.1