From 2c98b9bdb306aef2954aa85acd3d0966536e149d Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Fri, 21 Mar 2025 02:34:39 +0000 Subject: [PATCH 1/4] Bump docker compose Tool: gitpod/catfood.gitpod.cloud --- WORKSPACE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index a0b3e82738ac37..c3ce17aa5ba532 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -24,7 +24,7 @@ defaultArgs: rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz" jbBackendVersion: "latest" dockerVersion: "20.10.24" - dockerComposeVersion: "2.27.0-gitpod.0" + dockerComposeVersion: "v2.34.0-gitpod.1" ipfsKuboVersion: "v0.18.0" ipfsClusterVersion: "v1.0.8" schedulerExtenderVersion: "c1925d8" From fb0a4b56c60d38498813c3462b15aaa57d73526b Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Fri, 21 Mar 2025 02:35:05 +0000 Subject: [PATCH 2/4] Bump docker Tool: gitpod/catfood.gitpod.cloud --- WORKSPACE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index c3ce17aa5ba532..4a44a5d024cb89 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -23,7 +23,7 @@ defaultArgs: clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.3.tar.gz" rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz" jbBackendVersion: "latest" - dockerVersion: "20.10.24" + dockerVersion: "27.5.1" dockerComposeVersion: "v2.34.0-gitpod.1" ipfsKuboVersion: "v0.18.0" ipfsClusterVersion: "v1.0.8" From e8630442608719ab47fdb0c8ebf736f3601f9b5b Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Fri, 21 Mar 2025 02:50:21 +0000 Subject: [PATCH 3/4] Oops Tool: gitpod/catfood.gitpod.cloud --- WORKSPACE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index 4a44a5d024cb89..bc26c922b96029 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -24,7 +24,7 @@ defaultArgs: rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz" jbBackendVersion: "latest" dockerVersion: "27.5.1" - dockerComposeVersion: "v2.34.0-gitpod.1" + dockerComposeVersion: "2.34.0-gitpod.1" ipfsKuboVersion: "v0.18.0" ipfsClusterVersion: "v1.0.8" schedulerExtenderVersion: "c1925d8" From 2c94c6e8e44718546fbfbd989480051344a31c93 Mon Sep 17 00:00:00 2001 From: Kyle Brennan Date: Fri, 21 Mar 2025 03:26:01 +0000 Subject: [PATCH 4/4] Fix build Tool: gitpod/catfood.gitpod.cloud --- components/docker-up/BUILD.yaml | 2 ++ components/docker-up/dependencies.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/components/docker-up/BUILD.yaml b/components/docker-up/BUILD.yaml index e2341073ac03a5..5e3b572c55b2bb 100644 --- a/components/docker-up/BUILD.yaml +++ b/components/docker-up/BUILD.yaml @@ -49,6 +49,8 @@ packages: - ["mv", "components-docker-up--bin-docker-up/docker-up", "docker-up"] - ["mv", "components-docker-up--bin-docker-up/checksums.txt", "checksums.txt"] - ["mv", "components-docker-up--bin-docker-up/docker-compose", "docker-compose-linux-x86_64"] + - ["mv", "components-docker-up--bin-docker-up/docker-compose-linux-x86_64.provenance.json", "docker-compose-linux-x86_64.provenance.json"] + - ["mv", "components-docker-up--bin-docker-up/docker-compose-linux-x86_64.sbom.json", "docker-compose-linux-x86_64.sbom.json"] - ["rm", "-r", "components-docker-up--bin-docker-up"] - ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"] - ["rm", "-r", "components-docker-up--bin-runc-facade"] diff --git a/components/docker-up/dependencies.sh b/components/docker-up/dependencies.sh index 0770701727db72..8d50fec6bad51c 100755 --- a/components/docker-up/dependencies.sh +++ b/components/docker-up/dependencies.sh @@ -11,6 +11,8 @@ RUNC_VERSION=v1.1.9 curl -o docker.tgz -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" # Docker Compose is forked, we have to override the MTU curl -o docker-compose -fsSL "https://github.com/gitpod-io/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64" +curl -o docker-compose-linux-x86_64.provenance.json -fsSL "https://github.com/gitpod-io/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64.provenance.json" +curl -o docker-compose-linux-x86_64.sbom.json -fsSL "https://github.com/gitpod-io/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64.sbom.json" curl -o checksums.txt -fsSL "https://github.com/gitpod-io/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/checksums.txt" curl -o runc -fsSL "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64"