Skip to content

Commit d6ebdf0

Browse files
akosyakoviQQBot
andcommitted
gp rebuild with isolated debug workspace
Co-authored-by: Pudong Zheng <[email protected]>
1 parent cfc62ae commit d6ebdf0

38 files changed

+1464
-597
lines changed

WORKSPACE.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defaultArgs:
77
publishToNPM: true
88
publishToJBMarketplace: true
99
localAppVersion: unknown
10-
codeCommit: a22e18bcce821d889b541107a695dd93835c7cc7
10+
codeCommit: 0180d69921094cacdaa8d4b6ef007a0783a95e3b
1111
codeVersion: 1.75.0
1212
codeQuality: stable
1313
noVerifyJBPlugin: false
@@ -22,6 +22,7 @@ defaultArgs:
2222
jbBackendVersion: "latest"
2323
REPLICATED_API_TOKEN: ""
2424
REPLICATED_APP: ""
25+
dockerVersion: 20.10.17
2526
provenance:
2627
enabled: true
2728
slsa: true

components/docker-up/BUILD.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ packages:
88
- dependencies.sh
99
deps:
1010
- components/common-go:lib
11+
argdeps:
12+
- dockerVersion
1113
env:
1214
- CGO_ENABLED=0
1315
- GOOS=linux
16+
- DOCKER_VERSION=${dockerVersion}
1417
prep:
1518
- ["mv", "docker-up/main.go", "."]
1619
- ["rmdir", "docker-up"]

components/docker-up/dependencies.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
set -euo pipefail
77

8-
DOCKER_VERSION=20.10.17
98
DOCKER_COMPOSE_VERSION=2.8.0-gitpod.0
109
RUNC_VERSION=v1.1.4
1110

12-
curl -o docker.tgz -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz
13-
curl -o docker-compose -fsSL https://github.com/gitpod-io/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64
14-
curl -o runc -fsSL https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64
11+
curl -o docker.tgz -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz"
12+
curl -o docker-compose -fsSL "https://github.com/gitpod-io/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64"
13+
curl -o runc -fsSL "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64"

components/gitpod-cli/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gitpod-cli

0 commit comments

Comments
 (0)