From 7ff808446d30789cb2bfe9b2cc571b587525c5a3 Mon Sep 17 00:00:00 2001 From: hsw Date: Sat, 7 Mar 2026 07:53:57 +0900 Subject: [PATCH 1/2] Update buildkit --- .github/workflows/build-image.yml | 2 +- image/repo-snapshot/Dockerfile | 2 +- image/stage0/Dockerfile | 2 +- image/stage1/Dockerfile | 2 +- image/stage2/Dockerfile | 2 +- image/stage3/Dockerfile | 2 +- image/test-build-local.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 6a4006d..9c58cf0 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -58,7 +58,7 @@ jobs: uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0 with: driver-opts: >- - image=docker.io/moby/buildkit:v0.27.1@sha256:1e110c71d389d6d24f67b9438e2f7b8da749a6ff407b22a1631e025c95599368 + image=docker.io/moby/buildkit:v0.28.0@sha256:37539dd4d60fc70968d164d3850d903a2c56f6402214a1953fbf9fcb81ada731 buildkitd-flags: >- --oci-worker-snapshotter=stargz diff --git a/image/repo-snapshot/Dockerfile b/image/repo-snapshot/Dockerfile index 24e07d0..c5b310a 100644 --- a/image/repo-snapshot/Dockerfile +++ b/image/repo-snapshot/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.20.0@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d +# syntax=docker/dockerfile:1.22.0@sha256:4a43a54dd1fedceb30ba47e76cfcf2b47304f4161c0caeac2db1c61804ea3c91 # Syntax: https://github.com/moby/buildkit/blob/v0.25/frontend/dockerfile/docs/reference.md FROM docker.io/almalinux/10-toolbox:10.1-20260129@sha256:204d8dde5b69e09a4f9fa66e5cc8e3d71ed48eb64dcbcaea3768a56bc8671cd7 AS downloader diff --git a/image/stage0/Dockerfile b/image/stage0/Dockerfile index 0cbc5a4..38a3dae 100644 --- a/image/stage0/Dockerfile +++ b/image/stage0/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.20.0@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d +# syntax=docker/dockerfile:1.22.0@sha256:4a43a54dd1fedceb30ba47e76cfcf2b47304f4161c0caeac2db1c61804ea3c91 # Syntax: https://github.com/moby/buildkit/blob/v0.25/frontend/dockerfile/docs/reference.md # https://raw.githubusercontent.com/AlmaLinux/container-images/9ec2d07542f07e6781d6f388e66f1e3f2aac889e/Containerfiles/10/Containerfile.toolbox diff --git a/image/stage1/Dockerfile b/image/stage1/Dockerfile index 4555f69..0353002 100644 --- a/image/stage1/Dockerfile +++ b/image/stage1/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.20.0@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d +# syntax=docker/dockerfile:1.22.0@sha256:4a43a54dd1fedceb30ba47e76cfcf2b47304f4161c0caeac2db1c61804ea3c91 FROM stage0 AS root diff --git a/image/stage2/Dockerfile b/image/stage2/Dockerfile index 1d9428d..26c0793 100644 --- a/image/stage2/Dockerfile +++ b/image/stage2/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.20.0@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d +# syntax=docker/dockerfile:1.22.0@sha256:4a43a54dd1fedceb30ba47e76cfcf2b47304f4161c0caeac2db1c61804ea3c91 FROM stage1 AS root diff --git a/image/stage3/Dockerfile b/image/stage3/Dockerfile index 65e8e1e..542602e 100644 --- a/image/stage3/Dockerfile +++ b/image/stage3/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.20.0@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d +# syntax=docker/dockerfile:1.22.0@sha256:4a43a54dd1fedceb30ba47e76cfcf2b47304f4161c0caeac2db1c61804ea3c91 FROM docker.io/almalinux/10-toolbox:10.1-20260129@sha256:204d8dde5b69e09a4f9fa66e5cc8e3d71ed48eb64dcbcaea3768a56bc8671cd7 AS toolbox diff --git a/image/test-build-local.sh b/image/test-build-local.sh index b8aae6d..ea92690 100755 --- a/image/test-build-local.sh +++ b/image/test-build-local.sh @@ -3,7 +3,7 @@ readonly SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) readonly BUILD_DIR=$(realpath "$SCRIPT_DIR"/../build) -readonly buildkit_image='docker.io/moby/buildkit:v0.27.1@sha256:1e110c71d389d6d24f67b9438e2f7b8da749a6ff407b22a1631e025c95599368' +readonly buildkit_image='docker.io/moby/buildkit:v0.28.0@sha256:37539dd4d60fc70968d164d3850d903a2c56f6402214a1953fbf9fcb81ada731' readonly REGISTRY_PORT=51350 readonly REGISTRY_HOST="localhost:${REGISTRY_PORT}" From 8cb9ab0bafbc7256c03f887eb6a3d176c3d3d1b2 Mon Sep 17 00:00:00 2001 From: hsw Date: Sat, 7 Mar 2026 07:56:42 +0900 Subject: [PATCH 2/2] Update sccache,uv --- image/stage3/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/image/stage3/Dockerfile b/image/stage3/Dockerfile index 542602e..552c710 100644 --- a/image/stage3/Dockerfile +++ b/image/stage3/Dockerfile @@ -39,13 +39,13 @@ FROM toolbox AS download-uv RUN --mount=type=cache,id=download-uv,target=/var/cache/download <&2 ; exit 1 ;; esac @@ -73,13 +73,13 @@ FROM toolbox AS download-sccache RUN --mount=type=cache,id=download-sccache,target=/var/cache/download <&2 ; exit 1 ;; esac