diff --git a/.gitea/workflows/build-jupyter-ganymede.yaml b/.gitea/workflows/build-jupyter-ganymede.yaml index 95398c8..876b34e 100644 --- a/.gitea/workflows/build-jupyter-ganymede.yaml +++ b/.gitea/workflows/build-jupyter-ganymede.yaml @@ -9,16 +9,6 @@ jobs: "Build Jupyter Ganymede docker images": runs-on: woryzen steps: - - - 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 diff --git a/jupyter-ganymede/Dockerfile b/jupyter-ganymede/Dockerfile index 3767e8a..5148441 100644 --- a/jupyter-ganymede/Dockerfile +++ b/jupyter-ganymede/Dockerfile @@ -4,13 +4,7 @@ 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 --platform=$BUILDPLATFORM alpine:3.23 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 +FROM --platform=$BUILDPLATFORM build-base AS java-build RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ apk add openjdk11-jdk maven USER jovyan @@ -19,7 +13,7 @@ WORKDIR /home/jovyan 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 -T 16 -Dmaven.test.skip=true -q package +RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -Dmaven.test.skip=true -q package FROM build-base AS python-build RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \