Skip to content

Commit f0eafab

Browse files
authored
Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693) (#20694)
* Reapply "[image-builder-bob] bump up buildkit (#20690)" (#20693) This reverts commit 7137833. Tool: gitpod/catfood.gitpod.cloud * update Tool: gitpod/catfood.gitpod.cloud
1 parent cbc17ce commit f0eafab

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.github/workflows/build.yml

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ permissions:
44
contents: write # This is required for actions/checkout and create release
55
pull-requests: write
66
actions: write # This is required for trigger another action which is used by JetBrains integrateion tests
7+
packages: read
78
on:
89
pull_request:
910
types: [ opened, edited ]
@@ -229,6 +230,12 @@ jobs:
229230
cat report.html >> $GITHUB_STEP_SUMMARY
230231
231232
exit $RESULT
233+
- name: Login to GitHub Container Registry
234+
uses: docker/login-action@v3
235+
with:
236+
registry: ghcr.io
237+
username: ${{ github.actor }}
238+
password: ${{ secrets.GITHUB_TOKEN }}
232239
- name: Leeway Build
233240
id: leeway
234241
shell: bash

components/image-builder-bob/leeway.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the GNU Affero General Public License (AGPL).
33
# See License.AGPL.txt in the project root for license information.
44

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

77
USER root
88
RUN apk --no-cache add sudo bash \

components/workspacekit/pkg/seccomp/notify.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,9 @@ func (h *InWorkspaceHandler) Mount(req *libseccomp.ScmpNotifReq) (val uint64, er
275275
if strings.HasPrefix(dest, "/proc/self/") {
276276
target = filepath.Join("/proc", strconv.Itoa(int(req.Pid)), strings.TrimPrefix(dest, "/proc/self/"))
277277
}
278-
278+
if strings.HasPrefix(dest, "/proc/thread-self/") {
279+
target = filepath.Join("/proc", strconv.Itoa(int(req.Pid)), strings.TrimPrefix(dest, "/proc/thread-self/"))
280+
}
279281
stat, err := os.Lstat(target)
280282
if errors.Is(err, fs.ErrNotExist) {
281283
err = os.MkdirAll(target, 0755)

0 commit comments

Comments
 (0)