From 21643022b8730ab82c96e713491720c318f02277 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Wed, 24 Dec 2025 03:22:40 +0800 Subject: [PATCH] updated sage build --- .gitea/workflows/build-jupyter-sage.yaml | 19 ++++++------------- jupyter-sage/Dockerfile | 6 +++--- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/build-jupyter-sage.yaml b/.gitea/workflows/build-jupyter-sage.yaml index 991fa32..08566bb 100644 --- a/.gitea/workflows/build-jupyter-sage.yaml +++ b/.gitea/workflows/build-jupyter-sage.yaml @@ -9,14 +9,6 @@ jobs: "Build Jupyter Sage 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 @@ -28,10 +20,11 @@ jobs: name: Build and push jupyter-sage image uses: docker/build-push-action@v5.3.0 with: + builder: multiplatform-builder context: "{{defaultContext}}:jupyter-sage" - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true - pull: true - tags: gitea.woggioni.net/woggioni/jupyter-sage:latest - cache-from: type=registry,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx - cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx + build-args: "VERSION=10.8" + tags: | + gitea.woggioni.net/woggioni/jupyter-sage:latest + gitea.woggioni.net/woggioni/jupyter-sage:10.8 diff --git a/jupyter-sage/Dockerfile b/jupyter-sage/Dockerfile index 1c38776..44ee660 100644 --- a/jupyter-sage/Dockerfile +++ b/jupyter-sage/Dockerfile @@ -1,4 +1,5 @@ FROM debian:latest +ARG VERSION RUN apt-get update && apt-get upgrade RUN apt-get install -y bc binutils bzip2 ca-certificates cliquer cmake curl \ ecl eclib-tools fflas-ffpack g++ gap gcc gengetopt gfan gfortran \ @@ -30,7 +31,6 @@ RUN useradd jovyan -u 1000 -s /bin/bash -m -h /home/jovyan USER jovyan WORKDIR /home/jovyan COPY build.sh build.sh -RUN git clone -c core.symlinks=true --filter blob:none \ - --origin upstream --branch master --tags \ - https://github.com/sagemath/sage.git +ADD --chown=luser:luser git@github.com:sagemath/sage.git#${VERSION} sage +WORKDIR /home/jovyan/sage RUN export srcdir=/home/jovyan/sage source build.sh && prepare && build