updated Ganymede image

.gitea/workflows/build-jupyter-ganymede.yaml

@@ -9,14 +9,16 @@ jobs:
   "Build Jupyter Ganymede docker images":
     runs-on: woryzen
     steps:
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
+          name: multiplatform-builder
           driver: docker-container
+          cleanup: false
+          platforms: |
+            linux/amd64
+            linux/arm64
       -
         name: Login to Gitea container registry
         uses: docker/login-action@v3
@@ -34,5 +36,3 @@ jobs:
           push: true
           pull: true
           tags: gitea.woggioni.net/woggioni/jupyter-ganymede:latest
-          cache-from: type=local,src=/home/luser/.cache/buildx
-          cache-to: type=local,dest=/home/luser/.cache/buildx,mode=max

jupyter-ganymede/Dockerfile

@@ -1,23 +1,29 @@
-FROM alpine:3.21 AS build-base
+FROM alpine:3.23 AS build-base
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
     apk update &&\
     apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
 RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
 
-FROM build-base AS java-build
+FROM --platform=$BUILDPLATFORM alpine:3.23 AS build-base-native
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
-    apk add openjdk11-jdk  maven
+    apk update &&\
+    apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
+RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
+
+FROM build-base-native AS java-build
+RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
+    apk add openjdk11-jdk maven
 USER jovyan
 WORKDIR /home/jovyan
 #RUN curl -O https://repo1.maven.org/maven2/dev/hcf/ganymede/ganymede/2.1.2.20230910/ganymede-2.1.2.20230910.jar
 ADD --chown=jovyan:jovyan git@github.com:allen-ball/ganymede.git#trunk ganymede
 #RUN git clone https://github.com/allen-ball/ganymede.git ganymede
 WORKDIR /home/jovyan/ganymede
-RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -Dmaven.test.skip=true -q package
+RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -T 16 -Dmaven.test.skip=true -q package
     
 FROM build-base AS python-build
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
-    apk add openjdk21-jre
+    apk add openjdk25-jre
 USER jovyan
 WORKDIR /home/jovyan
 RUN python -m venv venv
@@ -28,10 +34,10 @@ RUN --mount=type=bind,from=java-build,src=/home/jovyan/ganymede/ganymede/target/
     java -jar /home/jovyan/ganymede.jar -i --copy-jar=true
 RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterhub
 
-FROM alpine:3.21
+FROM alpine:3.23
 RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
     apk update &&\
-    apk add python3 openjdk21-jre
+    apk add python3 openjdk25-jre
 RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
 USER jovyan
 COPY --from=python-build /home/jovyan /home/jovyan