From feba04dcc134cb5f108d25b431a951aa767b839b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 6 Jul 2024 00:39:02 +0200 Subject: [PATCH 01/11] Bump workflows --- .github/workflows/build.yml | 4 ++-- .github/workflows/publish.yml | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9880fec..e4bed5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,10 +23,10 @@ jobs: uses: actions/checkout@v4 # https://github.com/docker/setup-qemu-action - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 # https://github.com/docker/setup-buildx-action - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build docker image run: make docker-build env: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1359cb9..aa7933a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,12 +26,12 @@ jobs: uses: actions/checkout@v4 # https://github.com/docker/setup-qemu-action - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 # https://github.com/docker/setup-buildx-action - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: docker.io username: ${{ secrets.DOCKER_REPOSITORY_LOGIN }} @@ -56,7 +56,7 @@ jobs: name: Create the image manifest steps: - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: docker.io username: ${{ secrets.DOCKER_REPOSITORY_LOGIN }} @@ -69,7 +69,8 @@ jobs: docker.io/botsudo/docker-rustpython:arm64v8-latest \ docker.io/botsudo/docker-rustpython:386-latest \ docker.io/botsudo/docker-rustpython:ppc64le-latest \ - docker.io/botsudo/docker-rustpython:amd64-latest + docker.io/botsudo/docker-rustpython:amd64-latest \ + --amend - name: Push the manifest run: docker manifest push docker.io/botsudo/docker-rustpython:latest - name: Inspect the manifest From 2129657f30d92ef88cc34ce383a7ee422dab152f Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 6 Jul 2024 00:40:23 +0200 Subject: [PATCH 02/11] Update to Alpine 3.20 and RustPython 0.3.1 Closes #1 --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f423f52..94527db 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.18 as builder +FROM alpine:3.20 as builder WORKDIR /workdir -ARG RUST_PYTHON_VERSION="0.3.0" +ARG RUST_PYTHON_VERSION="0.3.1" ARG BUILD_DATE ARG VCS_REF @@ -26,7 +26,7 @@ RUN cargo fetch RUN cargo build --features freeze-stdlib --release --locked --offline --bin rustpython -FROM alpine:3.18 +FROM alpine:3.20 RUN apk --no-cache add musl libgcc From fa5a21600bab5705c701965821e1e83d589fd4e5 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 5 Aug 2024 10:38:17 +0200 Subject: [PATCH 03/11] Bump hub-tool --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aa7933a..6e8270f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -82,7 +82,7 @@ jobs: steps: - name: Install Docker hub-tool run: | - curl -sL https://github.com/docker/hub-tool/releases/download/v0.4.5/hub-tool-linux-amd64.tar.gz -o hub-tool-linux.tar.gz + curl -sL https://github.com/docker/hub-tool/releases/download/v0.4.6/hub-tool-linux-amd64.tar.gz -o hub-tool-linux.tar.gz tar --strip-components=1 -xzf ./hub-tool-linux.tar.gz ./hub-tool --version - name: Login hub-tool @@ -101,7 +101,7 @@ jobs: env: DOCKER_USERNAME: ${{ secrets.DOCKER_REPOSITORY_LOGIN }} DOCKER_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} - - name: Remove PR container image via hub-tool + - name: Remove the temporary images via hub-tool run: | ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:armv6-latest || true ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:armv7-latest || true From 9186ecc5bac5d7c93ce00cc532fb8f55adb6f528 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 13:13:07 +0100 Subject: [PATCH 04/11] Bump Alpine to 3.23 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 94527db..a16d33d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.20 as builder +FROM alpine:3.23 as builder WORKDIR /workdir @@ -26,7 +26,7 @@ RUN cargo fetch RUN cargo build --features freeze-stdlib --release --locked --offline --bin rustpython -FROM alpine:3.20 +FROM alpine:3.23 RUN apk --no-cache add musl libgcc From b704fa16a395886d12b869cc1d1f14795211ba05 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 13:14:34 +0100 Subject: [PATCH 05/11] Bump to version 2025-11-10-main-55 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a16d33d..000fc8e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.23 as builder WORKDIR /workdir -ARG RUST_PYTHON_VERSION="0.3.1" +ARG RUST_PYTHON_VERSION="2025-11-10-main-55" ARG BUILD_DATE ARG VCS_REF From 8d674dd5e42cffa132a3c349b9702f00bfd9cf15 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 13:15:54 +0100 Subject: [PATCH 06/11] Bump GitHub actions --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4bed5d..cbaf6ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"] steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # https://github.com/docker/setup-qemu-action - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6e8270f..917f9d0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,7 @@ jobs: - { platform: "linux/amd64", internal-tag: "amd64" } steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # https://github.com/docker/setup-qemu-action - name: Set up QEMU uses: docker/setup-qemu-action@v3 From e965cca2615f82ab21aaee7d7e33404b79bd47fa Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 13:16:05 +0100 Subject: [PATCH 07/11] Add s390x to the build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbaf6ca..5df10fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"] + platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64", "linux/s390x"] steps: - name: Checkout repository uses: actions/checkout@v6 From 564e97ddf8dcdb488f29e140f7da6eba64c4e943 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 15:17:09 +0100 Subject: [PATCH 08/11] Revert "Add s390x to the build" This reverts commit e965cca2615f82ab21aaee7d7e33404b79bd47fa. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5df10fe..cbaf6ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64", "linux/s390x"] + platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"] steps: - name: Checkout repository uses: actions/checkout@v6 From 12989638dac503a018a9dcceecd6da2a85955d55 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 15:20:15 +0100 Subject: [PATCH 09/11] Add linux/riscv64 to the build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbaf6ca..dc7818b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64"] + platform: ["linux/arm/v6", "linux/arm/v7", "linux/arm64/v8", "linux/386", "linux/ppc64le", "linux/amd64", "linux/riscv64"] steps: - name: Checkout repository uses: actions/checkout@v6 From 2fb6ea8a3e542097ae621fe9970ad4d924736c14 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 16:50:50 +0100 Subject: [PATCH 10/11] Add riscv64 to publish --- .github/workflows/publish.yml | 8 +++++++- README.md | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 917f9d0..e952f02 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,6 +7,9 @@ on: release: types: [released] +env: + HUB_TOOL_VERSION: 0.4.6 + jobs: build-image: runs-on: ubuntu-latest @@ -21,6 +24,7 @@ jobs: - { platform: "linux/386", internal-tag: "386" } - { platform: "linux/ppc64le", internal-tag: "ppc64le" } - { platform: "linux/amd64", internal-tag: "amd64" } + - { platform: "linux/riscv64", internal-tag: "amd64" } steps: - name: Checkout repository uses: actions/checkout@v6 @@ -70,6 +74,7 @@ jobs: docker.io/botsudo/docker-rustpython:386-latest \ docker.io/botsudo/docker-rustpython:ppc64le-latest \ docker.io/botsudo/docker-rustpython:amd64-latest \ + docker.io/botsudo/docker-rustpython:riscv64-latest \ --amend - name: Push the manifest run: docker manifest push docker.io/botsudo/docker-rustpython:latest @@ -82,7 +87,7 @@ jobs: steps: - name: Install Docker hub-tool run: | - curl -sL https://github.com/docker/hub-tool/releases/download/v0.4.6/hub-tool-linux-amd64.tar.gz -o hub-tool-linux.tar.gz + curl -sL https://github.com/docker/hub-tool/releases/download/v${{ env.HUB_TOOL_VERSION }}/hub-tool-linux-amd64.tar.gz -o hub-tool-linux.tar.gz tar --strip-components=1 -xzf ./hub-tool-linux.tar.gz ./hub-tool --version - name: Login hub-tool @@ -109,6 +114,7 @@ jobs: ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:386-latest || true ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:ppc64le-latest || true ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:amd64-latest || true + ./hub-tool tag rm --verbose --force docker.io/botsudo/docker-rustpython:riscv64-latest || true ./hub-tool tag ls --verbose docker.io/botsudo/docker-rustpython - name: Logout hub-tool if: always() diff --git a/README.md b/README.md index 4d12ae0..8ff122a 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ We support as much as possible, the list is: - `linux/arm/v7` - `linux/arm64/v8` - `linux/ppc64le` +- `linux/riscv64` For `linux/s390x`, it needs fixing: - See: https://github.com/nix-rust/nix/issues/1968 From 9c6f60693461005cc176e8d346da91e393a6f284 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 25 Dec 2025 17:35:23 +0100 Subject: [PATCH 11/11] Fixup riscv64 --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e952f02..5b0499c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,7 +24,7 @@ jobs: - { platform: "linux/386", internal-tag: "386" } - { platform: "linux/ppc64le", internal-tag: "ppc64le" } - { platform: "linux/amd64", internal-tag: "amd64" } - - { platform: "linux/riscv64", internal-tag: "amd64" } + - { platform: "linux/riscv64", internal-tag: "riscv64" } steps: - name: Checkout repository uses: actions/checkout@v6