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.

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

Custom mirror #1

Draft
wants to merge 25 commits into
base: master
Choose a base branch
from
Draft

Custom mirror #1

wants to merge 25 commits into from

Conversation

iQQBot
Copy link
Collaborator

@iQQBot iQQBot commented Sep 19, 2023

No description provided.

@iQQBot iQQBot force-pushed the custom-mirror branch 2 times, most recently from 9c035c9 to 7f38bfa Compare September 20, 2023 06:16
@iQQBot iQQBot changed the base branch from master to v0.12 September 22, 2023 08:26
@kylos101
Copy link
Collaborator

kylos101 commented Feb 1, 2024

Updated master via sync fork.

@kylos101
Copy link
Collaborator

kylos101 commented Feb 1, 2024

Will rebase these changes off of https://github.com/moby/buildkit/releases/tag/v0.12.5

@kylos101
Copy link
Collaborator

kylos101 commented Feb 1, 2024

Instructions for updating. After syncing our fork's default branch:

First, set some params:

# the release tag we want to patch from
export LATEST_RELEASE=v0.12.5
# the SHA of the immediate commit before our changes, to help create patch files
export COMMIT_REF=567a99433ca23402d5e9b9f9124005d2e59b8861
export FEATURE_BRANCH=custom-mirror

Then, do the update:

git checkout $FEATURE_BRANCH
git format-patch -i $COMMIT_REF
git branch -m old
git fetch upstream --tags
git checkout $LATEST_RELEASE # this tag must exist locally
git switch -c $FEATURE_BRANCH # use $LATEST_RELEASE as the base branch (or the version you want to publish)

git am *.patch --3way
git push --set-upstream origin $FEATURE_BRANCH --force

@kylos101 kylos101 changed the base branch from v0.12 to master February 1, 2024 20:14
@kylos101 kylos101 changed the base branch from master to v0.12 February 1, 2024 20:14
@kylos101
Copy link
Collaborator

kylos101 commented Feb 5, 2024

crazy-max and others added 18 commits February 18, 2025 10:15

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Devices can be marked as "automatically allowed" by TOML config
or by the CDI spec of specific file via annotation.

Device that is is not "automatically allowed" needs to be allowed
by the build request by passing entitlement. For example a Dockerfile
may not use a device without use invoking the build permitting it.

--allow device grants access to any device.
--allow device=kind|name grants access to specific device.
--allow device=kind|name,alias=kind|name allows mapping kind to
a specific device or one device to another. Alias is the name requested
by the build and device is the actual device that is being enabled.

Signed-off-by: Tonis Tiigi <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: Austin Vazquez <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
[v0.20] cherry-picks 0.20.0-rc3

Verified

This commit was signed with the committer’s verified signature.
jsternberg Jonathan A. Sternberg
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
jsternberg Jonathan A. Sternberg
Signed-off-by: CrazyMax <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
[v0.20] cherry-picks for v0.20.0

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: Tonis Tiigi <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Signed-off-by: Tonis Tiigi <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Should help with segmentation fault on libc-bin

Signed-off-by: Tonis Tiigi <[email protected]>

Partially verified

This commit is signed with the committer’s verified signature.
crazy-max’s contribution has been verified via GPG key.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
Fix issue 5763

- Discourage `--oci-worker-no-process-sandbox`, due to the leakage of
  the processes (by design).
  Instead, encourage setting `systempaths=unconfined` in `docker run`.
  This corresponds to `securityContext.procMount: Unmasked` in Kubernetes,
  however, the configuration is hard on Kubernetes, as it has to be used
  in conjunction with `hostUsers: false`.

- Remove `--device /dev/fuse`, as fuse-overlayfs is no longer used typically.

- Use the new Kubernetes struct for AppArmor

- Add a hint about `kernel.apparmor_restrict_unprivileged_userns`

- Remove `$` from command snippets for ease of copypasting

- Make `job.*.yaml` more practical

- Add `*.userns.yaml`. Needs `UserNamespaceSupport` feature gate to be enabled.

Signed-off-by: Akihiro Suda <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Base image may use unnormalized platform so if platform
is inherited normalize needs to be called again.

Signed-off-by: Tonis Tiigi <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
crazy-max CrazyMax
Brings in the gRPC message size fix for writing SBOMs.

Signed-off-by: Tonis Tiigi <[email protected]>

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
[v0.20] cherry-picks for v0.20.1
kylos101 pushed a commit that referenced this pull request Mar 21, 2025

Verified

This commit was signed with the committer’s verified signature.
thaJeztah Sebastiaan van Stijn
contains a fix for CVE-2024-45338 / https://go.dev/issue/70906, but it doesn't affect our codebase:

    govulncheck -show=verbose ./...
    ...
    Vulnerability #1: GO-2024-3333
        Non-linear parsing of case-insensitive content in golang.org/x/net/html
      More info: https://pkg.go.dev/vuln/GO-2024-3333
      Module: golang.org/x/net
        Found in: golang.org/x/[email protected]
        Fixed in: golang.org/x/[email protected]

    Your code is affected by 0 vulnerabilities.
    This scan also found 0 vulnerabilities in packages you import and 1
    vulnerability in modules you require, but your code doesn't appear to call these
    vulnerabilities.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@kylos101 kylos101 changed the base branch from v0.12 to master March 21, 2025 07:42
@kylos101
Copy link
Collaborator

kylos101 commented Mar 21, 2025

Synced our fork's master branch

From a workspace, I created these patch files to represent our desired customizations:
0001-e4a1b2d.patch
0002-6760ad3.patch
0003-9066d5e.patch
0004-af78548.patch
0005-5a93c66.patch

Changed the base of this PR to the master branch

git switched to https://github.com/moby/buildkit/releases/tag/v0.20.1 and then applied the patch files.

🚧 Topics to work through:

  1. Builds presently push to ghcr.
  2. We used to push to gitpod-core-dev (which is for branches, but not main)
  3. There are failing checks/tests, were they failing previously?

Then update image-builder-bob, so we can test in a preview.

Tool: gitpod/catfood.gitpod.cloud
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants