-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Remove "experimental" annotations for buildkit #1303
Remove "experimental" annotations for buildkit #1303
Conversation
BuildKit can now be enabled without the daemon having experimental features enabled. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
ping @andrewhsu @tiborvass @AntaresS PTAL |
|
||
flags.StringArrayVar(&options.secrets, "secret", []string{}, "Secret file to expose to the build (only if BuildKit enabled): id=mysecret,src=/local/secret") | ||
flags.SetAnnotation("secret", "experimental", nil) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wonder if we should have a new annotation to hide / disable these if the CLI (or daemon) is configured to use builder v1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean hide the progress
and secret
flags?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably better when builder v1 is configured on the cli side
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes; not a blocker for now, but would be good to look into
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Codecov Report
@@ Coverage Diff @@
## master #1303 +/- ##
==========================================
- Coverage 54.77% 54.76% -0.02%
==========================================
Files 292 292
Lines 19285 19285
==========================================
- Hits 10563 10561 -2
- Misses 8063 8064 +1
- Partials 659 660 +1 |
Pushed a second commit to move "sessions" out of experimental as well (per moby/moby#37686) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@tiborvass should the cli/cli/command/image/build.go Lines 153 to 154 in 2461cd6
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@@ -28,6 +28,9 @@ import ( | |||
const clientSessionRemote = "client-session" | |||
|
|||
func isSessionSupported(dockerCli command.Cli) bool { | |||
if versions.GreaterThanOrEqualTo(dockerCli.Client().ClientVersion(), "1.39") { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should check daemon version, not CLI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Daemon could be version 1.40, but the client downgraded to 1.10; in that case the API version that's used is 1.10, and it's not supported
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should check daemon version not cli
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
BuildKit can now be enabled without the daemon having experimental features enabled.
related engine PR; moby/moby#37686