Skip to content

gp rebuild with isolated debug workspace #15795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2023
Merged

gp rebuild with isolated debug workspace #15795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion WORKSPACE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaultArgs:
publishToNPM: true
publishToJBMarketplace: true
localAppVersion: unknown
codeCommit: a22e18bcce821d889b541107a695dd93835c7cc7
codeCommit: 0180d69921094cacdaa8d4b6ef007a0783a95e3b
codeVersion: 1.75.0
codeQuality: stable
noVerifyJBPlugin: false
Expand All @@ -22,6 +22,7 @@ defaultArgs:
jbBackendVersion: "latest"
REPLICATED_API_TOKEN: ""
REPLICATED_APP: ""
dockerVersion: 20.10.17
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kylos101 @aledbf The only change for the workspace team here is to extract docker version from docker-up to here. That we can bundle docker CLI of the same version in supervisor as a fallback if a user does not have one.

We would liek to land this PR after new cluster deployment. Are you fine with this change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@akosyakov can you add .workspace.yaml to the codeowners file and assign each product team?

👍 for the Single Source of Truth

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kylos101 would it be alright to create another PR for this file to consider ownership change.

We would like to land it I would like to avoid off-topic discussion on this PR 🙏

Also if you are fine with moving docker version there could you give an approve from the workspace team please 🙏

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also if you are fine with moving docker version there could you give an approve from the workspace team please pray

@akosyakov this PR is still in a draft state, is it ready for review?

@kylos101 would it be alright to create another PR for this file to consider ownership change.

Yes 👍

provenance:
enabled: true
slsa: true
Expand Down
3 changes: 3 additions & 0 deletions components/docker-up/BUILD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ packages:
- dependencies.sh
deps:
- components/common-go:lib
argdeps:
- dockerVersion
env:
- CGO_ENABLED=0
- GOOS=linux
- DOCKER_VERSION=${dockerVersion}
prep:
- ["mv", "docker-up/main.go", "."]
- ["rmdir", "docker-up"]
Expand Down
7 changes: 3 additions & 4 deletions components/docker-up/dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@

set -euo pipefail

DOCKER_VERSION=20.10.17
DOCKER_COMPOSE_VERSION=2.8.0-gitpod.0
RUNC_VERSION=v1.1.4

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
curl -o runc -fsSL https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64
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"
curl -o runc -fsSL "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64"
1 change: 1 addition & 0 deletions components/gitpod-cli/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gitpod-cli
Loading