build: bump dist image, switch to ubuntu:22.04 for riscv64

to really fix its glibc version to 2.35 (previously apparently the libc version gets bumped in an apt upgrade or install) Fixes: ruyisdk#104
xen0n · Mar 25, 2024 · c91265c · c91265c
1 parent 77061ef
commit c91265c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -60,7 +60,7 @@ jobs:
       run_id: ${{ github.run_id }}
       release_mirror_url: ${{ steps.run_dist.outputs.release_mirror_url }}
     container:
-      image: ghcr.io/ruyisdk/ruyi-python-dist:20240311
+      image: ghcr.io/ruyisdk/ruyi-python-dist:20240325
       options: --user root  # https://github.com/actions/checkout/issues/1014
       credentials:
         username: ${{ github.actor }}
@@ -79,7 +79,7 @@ jobs:
         if: success() && !matrix.skip
         uses: actions/cache@v4
         with:
-          key: ${{ runner.os }}-tgt-${{ matrix.arch }}-r2
+          key: ${{ runner.os }}-tgt-${{ matrix.arch }}-r3
           path: |
             /ccache
             /poetry-cache

diff --git a/scripts/_image_tag_base.sh b/scripts/_image_tag_base.sh
@@ -5,7 +5,7 @@ image_tag_base() {
 
     case "$arch" in
         ""|amd64|arm64|riscv64)
-            echo "ghcr.io/ruyisdk/ruyi-python-dist:20240311"
+            echo "ghcr.io/ruyisdk/ruyi-python-dist:20240325"
             ;;
         *)
             echo "error: unsupported arch $arch; supported are: amd64, arm64, riscv64" >&2

diff --git a/scripts/dist-image/Dockerfile b/scripts/dist-image/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 FROM --platform=linux/amd64 ubuntu:20.04 as build-amd64
 FROM --platform=linux/arm64 ubuntu:20.04 as build-arm64
-FROM --platform=linux/riscv64 debian:sid-20231030 as build-riscv64
+FROM --platform=linux/riscv64 riscv64/ubuntu:22.04 as build-riscv64
 
 FROM build-$TARGETARCH
 

diff --git a/scripts/dist-image/prepare-distro.sh b/scripts/dist-image/prepare-distro.sh
@@ -9,7 +9,7 @@ amd64|arm64)
     exec ./prepare-distro.ubuntu2004.sh
     ;;
 riscv64)
-    exec ./prepare-distro.debian.sh
+    exec ./prepare-distro.ubuntu2204-riscv64.sh
     ;;
 esac
 

diff --git a/scripts/dist-image/prepare-distro.debian.sh → ...mage/prepare-distro.ubuntu2204-riscv64.sh b/scripts/dist-image/prepare-distro.debian.sh → ...mage/prepare-distro.ubuntu2204-riscv64.sh
@@ -9,7 +9,7 @@ export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
 
 # HTTPS needs ca-certificates to work
-sed -i 's@http://deb\.debian\.org/@http://mirrors.huaweicloud.com/@g' /etc/apt/sources.list.d/debian.sources
+# sed -i 's@http://archive\.ubuntu\.com/@http://mirrors.huaweicloud.com/@g' /etc/apt/sources.list
 
 # Non-interactive configuration of tzdata
 debconf-set-selections <<EOF