archive-gh-me/gitpod
1
0
Fork 0
mirror of https://github.com/gitpod-io/gitpod.git synced 2025-12-08 17:36:30 +00:00
Code Issues Projects Releases Wiki Activity

[docker-up] update Docker Compose to 2.10.0-gitpod.1

Browse Source 
Context: https://github.com/gitpod-io/gitpod/pull/16368#issuecomment-1437114679

Related Docker Compose release: https://github.com/gitpod-io/compose/releases/tag/v2.10.0-gitpod.1

Also, refactored source of truth for Docker Compose version to WORKSPACE.yaml for consistency and consideration when changing Docker version
This commit is contained in:
Kyle Brennan 2023-02-20 17:45:21 +00:00 committed by Robo Quat
parent ce466d2594
commit 59b51a5b10
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WORKSPACE.yaml
View File

@ -23,6 +23,7 @@ defaultArgs:
REPLICATED_API_TOKEN: "" REPLICATED_API_TOKEN: ""
REPLICATED_APP: "" REPLICATED_APP: ""
dockerVersion: 20.10.17 dockerVersion: 20.10.17
dockerComposeVersion: "2.10.0-gitpod.1"
provenance: provenance:
enabled: true enabled: true
slsa: true slsa: true

7
components/docker-up/BUILD.yaml
View File

@ -10,10 +10,12 @@ packages:
- components/common-go:lib - components/common-go:lib
argdeps: argdeps:
- dockerVersion - dockerVersion
- dockerComposeVersion
env: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
- GOOS=linux - GOOS=linux
- DOCKER_VERSION=${dockerVersion} - DOCKER_VERSION=${dockerVersion}
- DOCKER_COMPOSE_VERSION=${dockerComposeVersion}
prep: prep:
- ["mv", "docker-up/main.go", "."] - ["mv", "docker-up/main.go", "."]
- ["rmdir", "docker-up"] - ["rmdir", "docker-up"]
@ -44,12 +46,11 @@ packages:
config: config:
commands: commands:
- ["mv", "components-docker-up--bin-docker-up/docker-up", "docker-up"] - ["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"]
- ["rm", "-r", "components-docker-up--bin-docker-up"] - ["rm", "-r", "components-docker-up--bin-docker-up"]
- ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"] - ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"]
- ["rm", "-r", "components-docker-up--bin-runc-facade"] - ["rm", "-r", "components-docker-up--bin-runc-facade"]
# Override docker-compose with custom version https://github.com/gitpod-io/compose/pull/1
- ["curl", "--fail", "-sSL", "https://github.com/gitpod-io/compose/releases/download/v2.10.0-gitpod.0/docker-compose-linux-x86_64", "-o", "docker-compose-linux-x86_64"]
- ["curl", "--fail", "-sSL", "https://github.com/gitpod-io/compose/releases/download/v2.10.0-gitpod.0/checksums.txt", "-o", "checksums.txt"]
- ["sha256sum", "-c", "checksums.txt"] - ["sha256sum", "-c", "checksums.txt"]
- ["mv", "docker-compose-linux-x86_64", "docker-compose"] - ["mv", "docker-compose-linux-x86_64", "docker-compose"]
- ["chmod", "+x", "docker-compose"] - ["chmod", "+x", "docker-compose"]

7
components/docker-up/dependencies.sh
View File

@ -5,9 +5,12 @@
set -euo pipefail set -euo pipefail
DOCKER_COMPOSE_VERSION=2.8.0-gitpod.0
RUNC_VERSION=v1.1.4 RUNC_VERSION=v1.1.4
# DOCKER_VERSION and DOCKER_COMPOSE_VERSION are defined in WORKSPACE.yaml
curl -o docker.tgz -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" curl -o docker.tgz -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz"
curl -o docker-compose -fsSL "https://github.com/gitpod-io/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64" # 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 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" curl -o runc -fsSL "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64"