From 19ff6e513cc71516f587ca76d5bcde3cfed3e9c6 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sat, 12 Apr 2025 14:08:34 -0400
Subject: update build scripts

---
 asterisk/Dockerfile |  3 ++-
 asterisk/build      | 10 ++++++++++
 bind9/Dockerfile    |  3 ++-
 bind9/build         | 10 ++++++++++
 caddy/Dockerfile    |  3 ++-
 caddy/build         | 10 ++++++++++
 caddy/entrypoint.sh | 21 ++++++++++++++++++++-
 env                 |  2 +-
 minecraft/build     |  4 ++--
 9 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100755 asterisk/build
 create mode 100755 bind9/build
 create mode 100755 caddy/build

diff --git a/asterisk/Dockerfile b/asterisk/Dockerfile
index 8486a55..d599222 100644
--- a/asterisk/Dockerfile
+++ b/asterisk/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine
+ARG ALPINE_VERSION="3.21"
+FROM alpine:${ALPINE_VERSION}
 
 # install packages
 RUN apk add --no-cache tini asterisk
diff --git a/asterisk/build b/asterisk/build
new file mode 100755
index 0000000..d29e198
--- /dev/null
+++ b/asterisk/build
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+. ../env
+
+IMAGE=asterisk
+
+init
+buildx
diff --git a/bind9/Dockerfile b/bind9/Dockerfile
index 761647f..a8e7d62 100644
--- a/bind9/Dockerfile
+++ b/bind9/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine
+ARG ALPINE_VERSION="3.21"
+FROM alpine:${ALPINE_VERSION}
 
 # install packages
 RUN apk add --no-cache tini bind
diff --git a/bind9/build b/bind9/build
new file mode 100755
index 0000000..f38f081
--- /dev/null
+++ b/bind9/build
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+. ../env
+
+IMAGE=bind9
+
+init
+buildx
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index e221a9d..1bdadcf 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine
+ARG ALPINE_VERSION="3.21"
+FROM alpine:${ALPINE_VERSION}
 
 # install packages
 RUN apk add --no-cache tini wget
diff --git a/caddy/build b/caddy/build
new file mode 100755
index 0000000..a68774a
--- /dev/null
+++ b/caddy/build
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+. ../env
+
+IMAGE=caddy
+
+init
+buildx
diff --git a/caddy/entrypoint.sh b/caddy/entrypoint.sh
index d8c4fc4..f44803a 100644
--- a/caddy/entrypoint.sh
+++ b/caddy/entrypoint.sh
@@ -1,6 +1,25 @@
 #!/bin/sh
 
-URL="https://caddyserver.com/api/download?os=linux&arch=amd64"
+case "$(uname -m)" in
+	"x86_64")
+		ARCH="&arch=amd64"
+		;;
+	"aarch64")
+		ARCH="&arch=arm64"
+		;;
+	"armv6")
+		ARCH="&arch=arm&arm=6"
+		;;
+	"armv7")
+		ARCH="&arch=arm&arm=7"
+		;;
+	*)
+		echo "invalid arch: $(uname -m)"
+		exit 1
+		;;
+esac
+
+URL="https://caddyserver.com/api/download?os=linux$ARCH"
 IFS=" "
 for module in $MODULES
 do
diff --git a/env b/env
index fda0d83..46c2473 100755
--- a/env
+++ b/env
@@ -7,7 +7,7 @@ USER="freya"
 # image info
 IMAGE="image"
 TAG="latest"
-ARCH="linux/amd64,linux/arm64"
+ARCH="linux/amd64,linux/arm64,linux/386,linux/arm/v6,linux/arm/v7"
 
 # builder args
 ALPINE_VERSION="3.21"
diff --git a/minecraft/build b/minecraft/build
index 8fd2655..889fad6 100755
--- a/minecraft/build
+++ b/minecraft/build
@@ -9,8 +9,8 @@ IMAGE=minecraft
 build() {
 	local TAG="$1"
 	local ARCH="$ARCH"
-	if [ $2 -eq 8 ]; then
-		ARCH="$ARCH,linux/386,linux/arm/v6,linux/arm/v7"
+	if [ $2 -ne 8 ]; then
+		ARCH="linux/amd64,linux/arm64"
 	fi
 	buildx --build-arg "JAVA_VERSION=$2"
 }
-- 
cgit v1.2.3-freya