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

Update buildkit CI after buildkit helm chart image change #247

Merged
merged 1 commit into from
Oct 30, 2024

Conversation

Secretions
Copy link
Collaborator

@Secretions Secretions commented Oct 30, 2024

The previous PR (#246) updated how the helm chart references the buildkit images, but our build process to vendor the buildkit images uses that chart's values, using the same string substitution separately, to determine the base image. This causes us to use the incorrect image when vendoring buildkit.

@Secretions
Copy link
Collaborator Author

CI skips buildkit in PRs here, so I ran it locally like this:

[anglerfish : 0 : 3:00PM] buildkit>docker buildx build --target root --build-arg BUILDKIT_TAG=$(yq '.buildkit.image.tag' ../../deployments/helm/hephaestus/values.yaml) . -t buildkit:root
[+] Building 0.8s (6/6) FINISHED                                                                               docker:desktop-linux
 => [internal] load build definition from Dockerfile                                                                           0.0s
 => => transferring dockerfile: 879B                                                                                           0.0s
 => [internal] load metadata for docker.io/moby/buildkit:v0.16.0                                                               0.7s
 => [internal] load .dockerignore                                                                                              0.0s
 => => transferring context: 2B                                                                                                0.0s
 => [root 1/2] FROM docker.io/moby/buildkit:v0.16.0@sha256:bc1fe18224dbcb92599139db0c745696c48ba9fd4ac24038d1fa81fdd7dcac27    0.0s
 => CACHED [root 2/2] RUN apk update &&     apk upgrade &&     rm -rf /var/cache/apk                                           0.0s
 => exporting to image                                                                                                         0.0s
 => => exporting layers                                                                                                        0.0s
 => => writing image sha256:92d43ebbf835f0cd925f6abf69f021bb455f831837a5630098955cd76d3d400c                                   0.0s
 => => naming to docker.io/library/buildkit:root                                                                               0.0s
[anglerfish : 0 : 3:00PM] buildkit>docker buildx build --target rootless --build-arg BUILDKIT_TAG=$(yq '.buildkit.rootlessImage.tag' ../../deployments/helm/hephaestus/values.yaml) . -t buildkit:rootless
[+] Building 0.4s (8/8) FINISHED                                                                               docker:desktop-linux
 => [internal] load build definition from Dockerfile                                                                           0.0s
 => => transferring dockerfile: 879B                                                                                           0.0s
 => [internal] load metadata for docker.io/moby/buildkit:v0.16.0-rootless                                                      0.4s
 => [internal] load .dockerignore                                                                                              0.0s
 => => transferring context: 2B                                                                                                0.0s
 => [rootless 1/4] FROM docker.io/moby/buildkit:v0.16.0-rootless@sha256:fed5f1fd2f8c2b246bc227e3f72953981dbe163a09add4c8cb9cc  0.0s
 => CACHED [rootless 2/4] RUN apk update &&     apk upgrade &&     rm -rf /var/cache/apk                                       0.0s
 => CACHED [rootless 3/4] RUN deluser user &&     adduser -u 1000 -D user &&     chown -R user:user /home/user &&     mkdir -  0.0s
 => CACHED [rootless 4/4] RUN addgroup -S -g 1337 istio &&     addgroup user istio &&     echo user:100000:150000 | tee /etc/  0.0s
 => exporting to image                                                                                                         0.0s
 => => exporting layers                                                                                                        0.0s
 => => writing image sha256:29cc737b56d4e2bcb8d5e90ece0f3e5aa12a48e666bb53d856189e914b0de001                                   0.0s
 => => naming to docker.io/library/buildkit:rootless    

@Secretions Secretions marked this pull request as ready for review October 30, 2024 22:01
@Secretions Secretions enabled auto-merge (squash) October 30, 2024 22:01
@Secretions Secretions changed the title Upstream changed the user on us, so buildkit image doesn't build Update buildkit CI after buildkit helm chart image change Oct 30, 2024
@Secretions Secretions merged commit f4423d6 into main Oct 30, 2024
7 checks passed
@Secretions Secretions deleted the fix-buildkit-rootless-build branch October 30, 2024 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants