3 files changed, 7 insertions(+), 44 deletions(-)

R apkbuilder/{Dockerfile.3.18 => Dockerfile}
D apkbuilder/Dockerfile.3.19
M apkbuilder/Makefile

@@ 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

@@ 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"]
-

@@ 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