Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693) #20694
Conversation
iQQBot
force-pushed
the
pd/upgrade-buildkit
branch
from
d5d1291 to
b568af2
Compare
| if strings.HasPrefix(dest, "/proc/thread-self/") { | ||
| target = filepath.Join("/proc", strconv.Itoa(int(req.Pid)), strings.TrimPrefix(dest, "/proc/thread-self/")) | ||
| } |
There was a problem hiding this comment.
How does this change impact regular workspaces, and prebuilds?
There was a problem hiding this comment.
I see tests were failing, and assume this is the intended fix:
--- FAIL: TestBaseImageBuild (50.03s)
--- FAIL: TestBaseImageBuild/database (0.00s)
--- FAIL: TestBaseImageBuild/database/it_should_build_a_base_image (50.03s)
--- FAIL: TestParallelBaseImageBuild (28.78s)
--- FAIL: TestParallelBaseImageBuild/image-builder (0.00s)
--- FAIL: TestParallelBaseImageBuild/image-builder/it_should_allow_parallel_build_of_images (28.78s)
There was a problem hiding this comment.
It would be good, I think, to get a review for this file from @Furisto @aledbf or @csweichel .
There was a problem hiding this comment.
We previously did not handle thread-self, so it would fallback to nsenter, using the tid/pid of nsenter at that time. Handling it here actually increases some security.
This reverts commit 7137833.
Tool: gitpod/catfood.gitpod.cloud
Description
This pid is actually thread id, it should be safe if we use in
thread-selfsee doc link
workspace integration test are success https://github.com/gitpod-io/gitpod/actions/runs/13993623337/job/39183946713?pr=20694
Related Issue(s)
Fixes CLC-1252
How to test
Documentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options
Build
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish
Installer
Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Saves cost. Untick this only if you're really sure you need a non-preemtible machine.
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh. If enabled,with-previewandwith-large-vmwill be enabled./hold