From ed2d3cfdfb81503e88d3ee7a0387b6dba0818f3e Mon Sep 17 00:00:00 2001
From: Dominic Ricottone <me@dominic-ricottone.com>
Date: Fri, 4 Oct 2024 13:41:52 -0500
Subject: [PATCH] APK builder

Dropping plans to support multiple versions, not worthwhile.

Updating to 3.20.
---
 apkbuilder/{Dockerfile.3.18 => Dockerfile} |  4 ++--
 apkbuilder/Dockerfile.3.19                 | 27 ----------------------
 apkbuilder/Makefile                        | 20 ++++------------
 3 files changed, 7 insertions(+), 44 deletions(-)
 rename apkbuilder/{Dockerfile.3.18 => Dockerfile} (88%)
 delete mode 100644 apkbuilder/Dockerfile.3.19

diff --git a/apkbuilder/Dockerfile.3.18 b/apkbuilder/Dockerfile
similarity index 88%
rename from apkbuilder/Dockerfile.3.18
rename to apkbuilder/Dockerfile
index adee4cc..d3382f6 100644
--- a/apkbuilder/Dockerfile.3.18
+++ b/apkbuilder/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.20
 
 RUN adduser -D builder && addgroup builder abuild
 
@@ -15,7 +15,7 @@ RUN echo "builder ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
 COPY abuild/*.rsa.pub /etc/apk/keys/
 RUN chmod 644 /etc/apk/keys/*.rsa.pub
 RUN mv /etc/apk/repositories /etc/apk/repositories.bak
-RUN echo "https://pkg.intra.dominic-ricottone.com/alpine/v3.18" | cat - /etc/apk/repositories.bak >/etc/apk/repositories
+RUN echo "https://pkg.intra.dominic-ricottone.com/alpine/v3.20" | cat - /etc/apk/repositories.bak >/etc/apk/repositories
 
 USER builder
 WORKDIR /home/builder
diff --git a/apkbuilder/Dockerfile.3.19 b/apkbuilder/Dockerfile.3.19
deleted file mode 100644
index 06bcca8..0000000
--- a/apkbuilder/Dockerfile.3.19
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM docker.io/library/alpine:3.19
-
-RUN adduser -D builder && addgroup builder abuild
-
-# packaging script
-COPY --chown=builder:builder build.sh /home/builder/build.sh
-RUN chmod 755 /home/builder/build.sh
-
-# packaging configuration
-COPY --chown=builder:builder abuild /home/builder/.abuild
-RUN chmod 600 /home/builder/.abuild/*
-
-RUN apk add --no-cache abuild sudo
-RUN echo "builder ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
-COPY abuild/*.rsa.pub /etc/apk/keys/
-RUN chmod 644 /etc/apk/keys/*.rsa.pub
-RUN mv /etc/apk/repositories /etc/apk/repositories.bak
-RUN echo "https://pkg.intra.dominic-ricottone.com/alpine/v3.19" | cat - /etc/apk/repositories.bak >/etc/apk/repositories
-
-USER builder
-WORKDIR /home/builder
-RUN mkdir -p /home/builder/packages
-VOLUME /home/builder/packages/src
-VOLUME /home/builder/src
-ENTRYPOINT ["/home/builder/build.sh"]
-CMD ["non_existant_package_name"]
-
diff --git a/apkbuilder/Makefile b/apkbuilder/Makefile
index 301d6e7..3d1500d 100644
--- a/apkbuilder/Makefile
+++ b/apkbuilder/Makefile
@@ -2,22 +2,12 @@ CONMAN=sudo docker
 
 REGISTRY=registry.intra.dominic-ricottone.com
 IMAGE=apkbuilder
-TAG_NUM_LATEST=3.19
-TAG_NUM_LEGACY=3.18
+TAG=latest
 
-image: image-legacy image-latest
-
-image-legacy:
-	$(CONMAN) buildx build --push \
-		--platform linux/arm64,linux/amd64 \
-		--tag $(REGISTRY)/$(IMAGE):$(TAG_NUM_LEGACY) \
-		. -f Dockerfile.3.18
-
-image-latest:
+image:
 	$(CONMAN) buildx build --push \
 		--platform linux/arm64,linux/amd64 \
-		--tag $(REGISTRY)/$(IMAGE):$(TAG_NUM_LATEST) \
-		--tag $(REGISTRY)/$(IMAGE):latest \
-		. -f Dockerfile.3.19
+		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
+		.
 
-.PHONY: image image-legacy image-latest
+.PHONY: image
-- 
2.45.2