diff --git a/.gitea/workflows/build-jupyter-ganymede.yaml b/.gitea/workflows/build-jupyter-ganymede.yaml index e636645..cfc389e 100644 --- a/.gitea/workflows/build-jupyter-ganymede.yaml +++ b/.gitea/workflows/build-jupyter-ganymede.yaml @@ -9,14 +9,6 @@ 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: - driver: docker-container - name: Login to Gitea container registry uses: docker/login-action@v3 @@ -34,5 +26,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 diff --git a/jupyter-ganymede/Dockerfile b/jupyter-ganymede/Dockerfile index 8b36ec8..a804657 100644 --- a/jupyter-ganymede/Dockerfile +++ b/jupyter-ganymede/Dockerfile @@ -4,7 +4,13 @@ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ 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 gitea.woggioni.net/woggioni/arch-builder:rust-full AS build-base-native +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-native AS java-build RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ apk add openjdk11-jdk maven USER jovyan