builder: fix detection of experimental --stream option (deprecated) #41648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit 6ca3ec8 deprecated the experimental "--stream" option for the legacy builder, adding an error message is a client attempted to use this feature. However, the detection used the session-ID (`session=xxx` query parameter), which happens to be set automatically by the CLI if it detects that the daemon has session support. Because of this, builds fail when trying to perform them on a daemon with the `--experimental` flag set. This patch changes the detection to look for the `remote` query parameter, which is set to "client-session" when using the `--stream` option with the classic (non-Buildkit) builder. Before this change, running `docker build` with an older (19.03 or older) cli against a daemon with `--experimental` enabled caused an error: $ dockerd --experimental & $ docker pull docker:18.09 $ docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock docker:18.09 sh -c 'echo "FROM scratch" | docker build -' Sending build context to Docker daemon 2.048kB Error response from daemon: experimental session with v1 builder is no longer supported, use builder version v2 (BuildKit) instead docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -w /foo docker:18.09 sh -c 'echo "FROM scratch" > Dockerfile && docker build --stream .' Error response from daemon: experimental session with v1 builder is no longer supported, use builder version v2 (BuildKit) instead With this patch, the error only occurs when trying to use the experimental `--stream` option: $ dockerd --experimental & $ docker pull docker:18.09 $ docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock docker:18.09 sh -c 'echo "FROM scratch" | docker build -' Step 1/1 : FROM scratch ---> No image was generated. Is your Dockerfile empty? $ docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -w /foo docker:18.09 sh -c 'echo "FROM scratch" > Dockerfile && docker build --stream .' Error response from daemon: experimental session with v1 builder is no longer supported, use builder version v2 (BuildKit) instead Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
tiborvass
approved these changes
Nov 6, 2020
thaJeztah
commented
Nov 6, 2020
| @@ -33,12 +33,7 @@ func Detect(config backend.BuildConfig) (remote builder.Source, dockerfile *pars | |||
| case remoteURL == "": | |||
| remote, dockerfile, err = newArchiveRemote(config.Source, dockerfilePath) | |||
| case remoteURL == ClientSessionRemote: | |||
| res, err := parser.Parse(config.Source) | |||
There was a problem hiding this comment.
FWIW; this function (remotecontext.Detect()) was only used by the classic builder, and not used in the CLI, so I thought this would be a good spot to produce the error (initially had it in the old place, but thought this would be cleaner)
This was referenced Nov 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #41647
Commit 6ca3ec8 deprecated (#39983) the experimental
--streamoption for the legacy builder, adding an error message is a client attempted to use this feature.However, the detection used the session-ID (
session=xxxquery parameter), which happens to be set automatically by the CLI if it detects that the daemon has session support. Because of this, builds fail when trying to perform them on a daemon with the--experimentalflag set.This patch changes the detection to look for the
remotequery parameter, which is set to "client-session" when using the--streamoption with the classic (non-Buildkit) builder.Before this change, running
docker buildwith an older (19.03 or older) cli against a daemon with--experimentalenabled caused an error:With this patch, the error only occurs when trying to use the experimental
--streamoption:- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)