From ab525d6a998b3b709cf22d005c62e81769ab8d15 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 22 Aug 2018 00:38:59 +0200 Subject: [PATCH 1/2] Remove "experimental" annotations for buildkit BuildKit can now be enabled without the daemon having experimental features enabled. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 60c75fda6771a94acd2f64d7a954f239eff6a5f4 Component: cli --- components/cli/cli/command/image/build.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/cli/cli/command/image/build.go b/components/cli/cli/command/image/build.go index be55d693b3..beb520368d 100644 --- a/components/cli/cli/command/image/build.go +++ b/components/cli/cli/command/image/build.go @@ -155,10 +155,8 @@ func NewBuildCommand(dockerCli command.Cli) *cobra.Command { flags.SetAnnotation("stream", "version", []string{"1.31"}) flags.StringVar(&options.progress, "progress", "auto", "Set type of progress output (only if BuildKit enabled) (auto, plain, tty). Use plain to show container output") - flags.SetAnnotation("progress", "experimental", nil) 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) flags.SetAnnotation("secret", "version", []string{"1.39"}) return cmd } From ab4d7a2303a9f5ef6724444b1e4bb11d9a8ecf1f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 22 Aug 2018 00:51:19 +0200 Subject: [PATCH 2/2] Move "session" support out of experimental for API 1.39 and up Signed-off-by: Sebastiaan van Stijn Upstream-commit: a500c394df753a82ad4967c2f20b1600defb98ab Component: cli --- components/cli/cli/command/image/build_session.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/cli/cli/command/image/build_session.go b/components/cli/cli/command/image/build_session.go index d4cda82fec..6015b0820c 100644 --- a/components/cli/cli/command/image/build_session.go +++ b/components/cli/cli/command/image/build_session.go @@ -28,6 +28,9 @@ import ( const clientSessionRemote = "client-session" func isSessionSupported(dockerCli command.Cli) bool { + if versions.GreaterThanOrEqualTo(dockerCli.Client().ClientVersion(), "1.39") { + return true + } return dockerCli.ServerInfo().HasExperimental && versions.GreaterThanOrEqualTo(dockerCli.Client().ClientVersion(), "1.31") }