5 files changed, 48 insertions(+), 9 deletions(-)

M README.md
R apkbuilder/{Dockerfile => Dockerfile.3.18}
A apkbuilder/Dockerfile.3.19
M apkbuilder/Makefile
M apkbuilder/README.md

@@ 8,7 8,7 @@ It should be easy to get things working on another build system.
 
 |Images |Tags |Fully qualified name of the default image|
 |:------|:----|:----------------------------------------|
-|[apkbuilder](/~dricottone/container-images/tree/dev/item/apkbuilder/README.md)|latest|`registry.intra.dominic-ricottone.com/apkbuilder:latest`|
+|[apkbuilder](/~dricottone/container-images/tree/dev/item/apkbuilder/README.md)|latest,3.18,3.19|`registry.intra.dominic-ricottone.com/apkbuilder:latest`|
 |[dnsmasq](/~dricottone/container-images/tree/dev/item/dnsmasq/README.md)|latest|`registry.intra.dominic-ricottone.com/dnsmasq:latest`|
 |[fcgi](/~dricottone/container-images/tree/dev/item/fcgi/README.md)|latest|`registry.intra.dominic-ricottone.com/fcgi:latest`|
 |[grafana](/~dricottone/container-images/tree/dev/item/grafana/README.md)|latest|`registry.intra.dominic-ricottone.com/grafana:latest`|

@@ 1,4 1,4 @@
-FROM docker.io/library/alpine:3.17
+FROM docker.io/library/alpine:3.18
 
 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.17" | cat - /etc/apk/repositories.bak >/etc/apk/repositories
+RUN echo "https://pkg.intra.dominic-ricottone.com/alpine/v3.18" | cat - /etc/apk/repositories.bak >/etc/apk/repositories
 
 USER builder
 WORKDIR /home/builder

@@ 0,0 1,27 @@
+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"]
+

@@ 2,12 2,22 @@ CONMAN=sudo docker
 
 REGISTRY=registry.intra.dominic-ricottone.com
 IMAGE=apkbuilder
-TAG=latest
+TAG_NUM_LATEST=3.19
+TAG_NUM_LEGACY=3.18
 
-image:
+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:
 	$(CONMAN) buildx build --push \
 		--platform linux/arm64,linux/amd64 \
-		--tag $(REGISTRY)/$(IMAGE):$(TAG) \
-		.
+		--tag $(REGISTRY)/$(IMAGE):$(TAG_NUM_LATEST) \
+		--tag $(REGISTRY)/$(IMAGE):latest \
+		. -f Dockerfile.3.19
 
-.PHONY: image
+.PHONY: image image-legacy image-latest

@@ 10,7 10,9 @@ make image
 
 ### Tags
 
- + `latest`
+ + `latest` (alias to `19`)
+ + `19` (for Alpine release 3.19)
+ + `18` (for Alpine release 3.18)
 
 ----