Skip to content
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

Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693) #20694

Merged
merged 2 commits into from
Apr 1, 2025
Merged

Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693) #20694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
985867d
Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693)
iQQBot Mar 21, 2025
b568af2
update
iQQBot Mar 21, 2025
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
7 changes: 7 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ permissions:
contents: write # This is required for actions/checkout and create release
pull-requests: write
actions: write # This is required for trigger another action which is used by JetBrains integrateion tests
packages: read
on:
pull_request:
types: [ opened, edited ]
Expand Down Expand Up @@ -229,6 +230,12 @@ jobs:
cat report.html >> $GITHUB_STEP_SUMMARY

exit $RESULT
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Leeway Build
id: leeway
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion components/image-builder-bob/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the GNU Affero General Public License (AGPL).
# See License.AGPL.txt in the project root for license information.

FROM eu.gcr.io/gitpod-core-dev/build/buildkit:v0.12.5-gitpod.0
FROM ghcr.io/gitpod-io/buildkit:v0.20.1-gitpod.2

USER root
RUN apk --no-cache add sudo bash \
Expand Down
4 changes: 3 additions & 1 deletion components/workspacekit/pkg/seccomp/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ func (h *InWorkspaceHandler) Mount(req *libseccomp.ScmpNotifReq) (val uint64, er
if strings.HasPrefix(dest, "/proc/self/") {
target = filepath.Join("/proc", strconv.Itoa(int(req.Pid)), strings.TrimPrefix(dest, "/proc/self/"))
}

if strings.HasPrefix(dest, "/proc/thread-self/") {
target = filepath.Join("/proc", strconv.Itoa(int(req.Pid)), strings.TrimPrefix(dest, "/proc/thread-self/"))
}
Comment on lines +278 to +280
Copy link
Contributor

Choose a reason for hiding this comment

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

How does this change impact regular workspaces, and prebuilds?

Copy link
Contributor

Choose a reason for hiding this comment

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

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)

Copy link
Contributor

Choose a reason for hiding this comment

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

It would be good, I think, to get a review for this file from @Furisto @aledbf or @csweichel .

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

@iQQBot we were talking earlier today, my recollection is, something in buildkit must have changed and is now relying on threading, whereas previously it was not. However, we don't know what that is, is that right?

May I ask, how did you find this change was necessary? As in, what led you to make this change? Can you link to something that tipped you off / pointed you in the right direction? I ask because I'm curious how you did the related debugging. For example, I am not sure if you saw something with journalct or dmesg and wish to know more.

I found upload_parallelism was added:
moby/buildkit@22f6b3e#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R581

It mentions:

Each individual layer is uploaded with 5 threads, using the Upload manager provided by the AWS SDK.

Perhaps that is it?

I see we use many gorountimes and then upload here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Image build fail if not change this

stat, err := os.Lstat(target)
if errors.Is(err, fs.ErrNotExist) {
err = os.MkdirAll(target, 0755)
Expand Down
Loading