Skip to content

Commit e9642e9

Browse files
geroplona-agent
authored andcommitted
Fix docker-compose checksum verification, bump buildkit
The upstream docker/compose checksums.txt includes entries for all platforms. Filter to linux-x86_64 only since that's all we download. The fork's checksums.txt only had the files it published, so this wasn't an issue before. Also bump buildkit from v0.20.1-gitpod.5 to v0.20.1-gitpod.6 to pick up grpc fix for GHSA-p77j-4mvh-x3m3. Co-authored-by: Ona <no-reply@ona.com>
1 parent 1217583 commit e9642e9

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

components/docker-up/dependencies.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ curl -o docker.tgz -fsSL "https://download.docker.com/linux/static/stable/x
1313
curl -o docker-compose -fsSL "https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64"
1414
curl -o docker-compose-linux-x86_64.provenance.json -fsSL "https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64.provenance.json"
1515
curl -o docker-compose-linux-x86_64.sbom.json -fsSL "https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64.sbom.json"
16-
curl -o checksums.txt -fsSL "https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/checksums.txt"
16+
# Filter checksums to only the linux-x86_64 files we downloaded
17+
curl -fsSL "https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/checksums.txt" \
18+
| grep "linux-x86_64" > checksums.txt
1719

1820
curl -o runc -fsSL "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64"

components/image-builder-bob/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

5-
FROM ghcr.io/gitpod-io/buildkit:v0.20.1-gitpod.5
5+
FROM ghcr.io/gitpod-io/buildkit:v0.20.1-gitpod.6
66

77
USER root
88
RUN apk --no-cache add sudo bash \

0 commit comments

Comments
 (0)