Fix APK package build

Author: steelhead31

linux/jdk/alpine/src/main/packaging/Dockerfile

@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:3.19
+FROM ${CONTAINER_REGISTRY}alpine:latest
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \

linux/jdk/alpine/src/main/packaging/entrypoint.sh

@@ -6,11 +6,19 @@ set -euox pipefail
 mkdir /home/builder/workspace
 cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
+# Install Adoptium Public Key
+sudo chmod 664 /etc/apk/repositories
+sudo chgrp abuild /etc/apk/repositories
+sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
+sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
+sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
+
 # Set permssions
 sudo chown -R builder /home/builder/out
 
 # Build package and set distributions it supports
 cd /home/builder/workspace/packaging
+sudo apk update
 abuild -r
 
 arch=$(abuild -A)

linux/jre/alpine/src/main/packaging/Dockerfile

@@ -1,6 +1,6 @@
 ARG CONTAINER_REGISTRY=""
 
-FROM ${CONTAINER_REGISTRY}alpine:3.19
+FROM ${CONTAINER_REGISTRY}alpine:latest
 ENV GOSU_VERSION 1.14
 
 RUN set -eux; \
@@ -9,15 +9,19 @@ RUN set -eux; \
 		alpine-sdk \
 		bash \
 		ca-certificates \
+		doas \
 		dpkg \
-		sudo
+		sudo \
+		wget
 
 # Create unprivileged user for building, see
 # https://github.com/hexops/dockerfile#use-a-static-uid-and-gid
 RUN adduser -D -h /home/builder builder \
     && addgroup builder abuild \
-    && echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
+    && echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \
+    && echo 'permit builder as root' > /etc/doas.d/doas.conf
 
+# Add GPG key
 USER builder
 WORKDIR /home/builder
 RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \

linux/jre/alpine/src/main/packaging/entrypoint.sh

@@ -6,11 +6,19 @@ set -euox pipefail
 mkdir /home/builder/workspace
 cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
+# Install Adoptium Public Key
+sudo chmod 664 /etc/apk/repositories
+sudo chgrp abuild /etc/apk/repositories
+sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
+sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
+sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
+
 # Set permssions
 sudo chown -R builder /home/builder/out
 
 # Build package and set distributions it supports
 cd /home/builder/workspace/packaging
+sudo apk update
 abuild -r
 
 arch=$(abuild -A)