From 6039f00c6ac5a24b335e67ef7adbf2d9541ee53b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 10 Jan 2023 16:28:51 +0900 Subject: [PATCH 01/10] [DNM] update BuildKit (0.11.0-rc1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.6 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.6 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 diff --git a/Dockerfile b/Dockerfile index f2612545596..e2f1c70d08d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.10.6 +ARG BUILDKIT_VERSION=v0.11.0-rc1 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.6 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.6 deleted file mode 100644 index b301439a76b..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.6 +++ /dev/null @@ -1,2 +0,0 @@ -9a21a41298c4a2a7a2b57cb90d37463d3a9057aedfe97a04b0e4fd6f622549d8 buildkit-v0.10.6.linux-amd64.tar.gz -e0d5533808f3c0cb57ad26b8fd962566625b35b0921a46df91980d6f0a78fd10 buildkit-v0.10.6.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 new file mode 100644 index 00000000000..b39fc5e91e5 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 @@ -0,0 +1,2 @@ +b3aeeec3ba90a90e90a0fac0e4b5525d7df201c08ca4079801b856e59121a8c0 buildkit-v0.11.0-rc1.linux-amd64.tar.gz +12762d2eb7f0436e87d6bf204dbdb10099e652c78ec75ee617513ab3beaf92df buildkit-v0.11.0-rc1.linux-arm64.tar.gz From 32409d9d98c89bd5234837ea01a6699906972e1b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 11:13:00 +0900 Subject: [PATCH 02/10] [DNM] update BuildKit (0.11.0-rc2) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 diff --git a/Dockerfile b/Dockerfile index e2f1c70d08d..d1366bcce9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1 +ARG BUILDKIT_VERSION=v0.11.0-rc2 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 deleted file mode 100644 index b39fc5e91e5..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc1 +++ /dev/null @@ -1,2 +0,0 @@ -b3aeeec3ba90a90e90a0fac0e4b5525d7df201c08ca4079801b856e59121a8c0 buildkit-v0.11.0-rc1.linux-amd64.tar.gz -12762d2eb7f0436e87d6bf204dbdb10099e652c78ec75ee617513ab3beaf92df buildkit-v0.11.0-rc1.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 new file mode 100644 index 00000000000..7750ce44653 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 @@ -0,0 +1,2 @@ +f6669c6ce6eda0cd5ae53c1ebbc702eecd13b25b1f45dcde4a9165443791351c buildkit-v0.11.0-rc2.linux-amd64.tar.gz +fc8904fe34daf674c29021113fe0a73e2f13d3aead9a9565cc67355bcf494c4b buildkit-v0.11.0-rc2.linux-arm64.tar.gz From f4e26acf067d639dfb8c4aa193cf689e7e427a20 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 12:35:46 +0900 Subject: [PATCH 03/10] [DNM] update BuildKit (0.11.0-rc1-63-g0e1e7d6e) Signed-off-by: Akihiro Suda --- Dockerfile | 12 ++++++------ Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 diff --git a/Dockerfile b/Dockerfile index d1366bcce9e..4c5c8c6be38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc2 +ARG BUILDKIT_VERSION=v0.11.0-rc1-63-g0e1e7d6e # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling @@ -136,11 +136,11 @@ RUN fname="cni-plugins-${TARGETOS:-linux}-${TARGETARCH:-amd64}-${CNI_PLUGINS_VER rm -f "${fname}" && \ echo "- CNI plugins: ${CNI_PLUGINS_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG BUILDKIT_VERSION -RUN fname="buildkit-${BUILDKIT_VERSION}.${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/${fname}" && \ - grep "${fname}" "/SHA256SUMS.d/buildkit-${BUILDKIT_VERSION}" | sha256sum -c && \ - tar xzf "${fname}" -C /out && \ - rm -f "${fname}" /out/bin/buildkit-qemu-* /out/bin/buildkit-runc && \ +RUN git clone https://github.com/moby/buildkit.git /go/src/github.com/moby/buildkit && \ + cd /go/src/github.com/moby/buildkit && \ + git checkout "${BUILDKIT_VERSION}" && \ + CGO_ENABLED=0 go build -o /out/bin/buildctl ./cmd/buildctl && \ + CGO_ENABLED=0 go build -o /out/bin/buildkitd ./cmd/buildkitd && \ echo "- BuildKit: ${BUILDKIT_VERSION}" >> /out/share/doc/nerdctl-full/README.md # NOTE: github.com/moby/buildkit/examples/systemd is not included in BuildKit v0.8.x, will be included in v0.9.x RUN cd /out/lib/systemd/system && \ diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 deleted file mode 100644 index 7750ce44653..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.11.0-rc2 +++ /dev/null @@ -1,2 +0,0 @@ -f6669c6ce6eda0cd5ae53c1ebbc702eecd13b25b1f45dcde4a9165443791351c buildkit-v0.11.0-rc2.linux-amd64.tar.gz -fc8904fe34daf674c29021113fe0a73e2f13d3aead9a9565cc67355bcf494c4b buildkit-v0.11.0-rc2.linux-arm64.tar.gz From 3940a32a2c790f57a81a809295d92b148793ea9b Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 12:50:12 +0900 Subject: [PATCH 04/10] [DNM] update BuildKit (0.11.0-rc1-96-ged041ab3) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c5c8c6be38..4ad2889f0de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-63-g0e1e7d6e +ARG BUILDKIT_VERSION=v0.11.0-rc1-96-ged041ab3 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From ae8ded1c5b27d96fb7ad4bc7be72d00397025f6f Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 13:07:31 +0900 Subject: [PATCH 05/10] [DNM] update BuildKit (0.11.0-rc1-80-g6b004d35) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ad2889f0de..6e605703d2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-96-ged041ab3 +ARG BUILDKIT_VERSION=v0.11.0-rc1-80-g6b004d35 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From 8b5b049a157f6e693ae218ccc2cc86e8dfbc2bdb Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 13:25:22 +0900 Subject: [PATCH 06/10] [DNM] update BuildKit (0.11.0-rc1-84-gc0ac5e8b) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e605703d2a..fa1c1eb9e92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-80-g6b004d35 +ARG BUILDKIT_VERSION=v0.11.0-rc1-84-gc0ac5e8b # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From 03aba61de9680cf4ac4a0fe280ace7d005b3de1e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 13:36:33 +0900 Subject: [PATCH 07/10] [DNM] update BuildKit (0.11.0-rc1-90-gab0d1a6e) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa1c1eb9e92..34742a6238c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-84-gc0ac5e8b +ARG BUILDKIT_VERSION=v0.11.0-rc1-90-gab0d1a6e # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From fcb16f08cc2eeba2a4a5ea170f4ad91a87629895 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 13:54:11 +0900 Subject: [PATCH 08/10] [DNM] update BuildKit (0.11.0-rc1-87-g179bed6b) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34742a6238c..521af5c3058 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-90-gab0d1a6e +ARG BUILDKIT_VERSION=v0.11.0-rc1-87-g179bed6b # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From 37a9e7c6ee08306a39266194855c9505a315ddfe Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 14:26:52 +0900 Subject: [PATCH 09/10] [DNM] update BuildKit (0.11.0-rc1-89-g926451ee) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 521af5c3058..222c31a43bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-87-g179bed6b +ARG BUILDKIT_VERSION=v0.11.0-rc1-89-g926451ee # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling From 24ddf10026c8029009240d4eb2293f328616c0fe Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 12 Jan 2023 14:40:51 +0900 Subject: [PATCH 10/10] [DNM] update BuildKit (0.11.0-rc1-88-ge5f99592) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 222c31a43bd..1cd0cc8aa1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.11.0-rc1-89-g926451ee +ARG BUILDKIT_VERSION=v0.11.0-rc1-88-ge5f99592 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0 # Extra deps: Nydus Lazy-pulling