Skip to content

Commit

Permalink
[docker-up] update Docker Compose to 2.10.0-gitpod.1
Browse files Browse the repository at this point in the history
Context: #16368 (comment)

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
  • Loading branch information
kylos101 committed Feb 20, 2023
1 parent cca07f1 commit 1fd2fc1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions WORKSPACE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ defaultArgs:
REPLICATED_API_TOKEN: ""
REPLICATED_APP: ""
dockerVersion: 20.10.17
dockerComposeVersion: "2.10.0-gitpod.1"
provenance:
enabled: true
slsa: true
Expand Down
7 changes: 4 additions & 3 deletions components/docker-up/BUILD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ packages:
- components/common-go:lib
argdeps:
- dockerVersion
- dockerComposeVersion
env:
- CGO_ENABLED=0
- GOOS=linux
- DOCKER_VERSION=${dockerVersion}
- DOCKER_COMPOSE_VERSION=${dockerComposeVersion}
prep:
- ["mv", "docker-up/main.go", "."]
- ["rmdir", "docker-up"]
Expand Down Expand Up @@ -44,12 +46,11 @@ packages:
config:
commands:
- ["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"]
- ["mv", "components-docker-up--bin-runc-facade/docker-up", "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"]
- ["mv", "docker-compose-linux-x86_64", "docker-compose"]
- ["chmod", "+x", "docker-compose"]
Expand Down
7 changes: 5 additions & 2 deletions components/docker-up/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@

set -euo pipefail

DOCKER_COMPOSE_VERSION=2.8.0-gitpod.0
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-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"

0 comments on commit 1fd2fc1

Please sign in to comment.