From 49124afda043d0f9573379335a63e11a283094bf Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sat, 12 Apr 2025 14:16:31 -0400
Subject: update build

---
 asterisk/build  |  8 ++++----
 bind9/build     |  8 ++++----
 build           |  8 ++++++++
 caddy/build     |  8 ++++----
 env             |  4 +---
 init            |  4 ++++
 minecraft/build | 10 ++++++----
 7 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100755 build
 create mode 100755 init

diff --git a/asterisk/build b/asterisk/build
index d29e198..d658eb4 100755
--- a/asterisk/build
+++ b/asterisk/build
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 set -e
-
-. ../env
+me="$(realpath "$0")"
+dir="$(dirname "$me")"
+. "$dir/../env"
 
 IMAGE=asterisk
 
-init
-buildx
+buildx "$dir" "$@"
diff --git a/bind9/build b/bind9/build
index f38f081..026ba04 100755
--- a/bind9/build
+++ b/bind9/build
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 set -e
-
-. ../env
+me="$(realpath "$0")"
+dir="$(dirname "$me")"
+. "$dir/../env"
 
 IMAGE=bind9
 
-init
-buildx
+buildx "$dir" "$@"
diff --git a/build b/build
new file mode 100755
index 0000000..db7c334
--- /dev/null
+++ b/build
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+./asterisk/build "$@"
+./bind9/build "$@"
+./caddy/build "$@"
+./minecraft/build "$@"
diff --git a/caddy/build b/caddy/build
index a68774a..3c42345 100755
--- a/caddy/build
+++ b/caddy/build
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 set -e
-
-. ../env
+me="$(realpath "$0")"
+dir="$(dirname "$me")"
+. "$dir/../env"
 
 IMAGE=caddy
 
-init
-buildx
+buildx "$dir" "$@"
diff --git a/env b/env
index 46c2473..8bda1f8 100755
--- a/env
+++ b/env
@@ -23,10 +23,8 @@ init() {
 
 buildx() {
 	docker buildx build \
-		--push \
 		--platform "$ARCH" \
 		-t "$REMOTE/$USER/$IMAGE:$TAG" \
 		--build-arg "ALPINE_VERSION=$ALPINE_VERSION" \
-		$@ \
-		.
+		$@
 }
diff --git a/init b/init
new file mode 100755
index 0000000..dfeb098
--- /dev/null
+++ b/init
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. ./env
+init
diff --git a/minecraft/build b/minecraft/build
index 889fad6..361b796 100755
--- a/minecraft/build
+++ b/minecraft/build
@@ -1,21 +1,23 @@
 #!/bin/sh
 
 set -e
-
-. ../env
+me="$(realpath "$0")"
+dir="$(dirname "$me")"
+. "$dir/../env"
 
 IMAGE=minecraft
 
+args="$@"
+
 build() {
 	local TAG="$1"
 	local ARCH="$ARCH"
 	if [ $2 -ne 8 ]; then
 		ARCH="linux/amd64,linux/arm64"
 	fi
-	buildx --build-arg "JAVA_VERSION=$2"
+	buildx "$dir" --build-arg "JAVA_VERSION=$2" $args
 }
 
-init
 build java8 8
 build java11 11
 build java17 17
-- 
cgit v1.2.3-freya