From feba04dcc134cb5f108d25b431a951aa767b839b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 6 Jul 2024 00:39:02 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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