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

Add explicit variants to buildkit (rc, dev, 0.13, for now) #744

Merged
merged 3 commits into from
Jun 25, 2024

Conversation

tianon
Copy link
Owner

@tianon tianon commented Jun 25, 2024

This is something I've been considering doing for a while (since the 0.13 series of RCs, actually), but was never quite happy with -- the advent of #743 needing a new 0.13 build encouraged me to Do The Thing (specifically to include a "0.13" variant so we can do a rebuild of 0.13 with that backported patch so we can fix the current Kong build issue in DOI without also introducing other potential issues by doing a full upgrade to 0.14 just yet).

FYI @yosifkit @whalelines @LaurentGoderre - new tianon/buildkit:0.13 incoming which should fix the Kong build issues (thanks to #743, although I still think we need to continue exploring #742).

@tianon tianon force-pushed the buildkit-variants branch 2 times, most recently from 09ab219 to b88417c Compare June 25, 2024 21:27
@tianon
Copy link
Owner Author

tianon commented Jun 25, 2024

(had to exclude my "backport" patch on dev where it's already fixed 😄)

@tianon tianon force-pushed the buildkit-variants branch from b88417c to 2b78191 Compare June 25, 2024 21:51
@tianon
Copy link
Owner Author

tianon commented Jun 25, 2024

My favorite way to review gsl.sh changes:

$ diff -u path-to/tianon-bashbrew/library/buildkit <(./gsl.sh)
--- path-to/tianon-bashbrew/library/buildkit	2024-06-25 14:53:40.000000000 -0700
+++ /dev/fd/63	2024-06-25 14:54:28.612188442 -0700
@@ -1,8 +1,12 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon)
 GitRepo: https://github.com/tianon/dockerfiles.git
+GitCommit: da8faac5ad0601a8948dee69e72ec669a9da9432
+Directory: buildkit
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 Builder: buildkit
 
 Tags: 0.14.1, 0.14, 0, latest
-GitCommit: 59e107d98a63148d38fe48bbbf4b42d3f1534099
-Directory: buildkit
+File: Dockerfile
+
+Tags: 0.13.2, 0.13
+File: Dockerfile.0.13

@tianon
Copy link
Owner Author

tianon commented Jun 25, 2024

Overly pedantic Tianon results in:

$ diff -u path-to/tianon-bashbrew/library/buildkit <(./gsl.sh)
--- path-to/tianon-bashbrew/library/buildkit	2024-06-25 14:53:40.000000000 -0700
+++ /dev/fd/63	2024-06-25 14:57:52.738072071 -0700
@@ -1,8 +1,11 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon)
 GitRepo: https://github.com/tianon/dockerfiles.git
+GitCommit: 862ae508afd4aca17986a51f532dce097d23e339
+Directory: buildkit
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
 Builder: buildkit
 
 Tags: 0.14.1, 0.14, 0, latest
-GitCommit: 59e107d98a63148d38fe48bbbf4b42d3f1534099
-Directory: buildkit
+
+Tags: 0.13.2, 0.13
+File: Dockerfile.0.13

@tianon tianon merged commit 2fe0dfe into tianon:master Jun 25, 2024
54 checks passed
@tianon tianon deleted the buildkit-variants branch June 25, 2024 23:16
Copy link

@whalelines whalelines left a comment

Choose a reason for hiding this comment

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

So you are simply building more BuildKit variants?

@thaJeztah
Copy link

thaJeztah commented Jun 26, 2024

So you are simply building more BuildKit variants?

But they are "obviously Tianon" versions! 🥹

@tianon
Copy link
Owner Author

tianon commented Jun 26, 2024

Yep, just more versions (especially so we can get a rebuild of our 0.13 with that fix we need for Kong, but also so it's easier for me to test things like RCs in the future)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants