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

build: change --console=[auto,false,true] to --progress=[auto,plain,tty] #1276

Merged
merged 1 commit into from Aug 16, 2018

Conversation

Projects
None yet
5 participants
@tiborvass
Copy link
Contributor

tiborvass commented Aug 6, 2018

This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.

In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.

Signed-off-by: Tibor Vass tibor@docker.com

@@ -308,6 +307,16 @@ func ValidateSysctl(val string) (string, error) {
return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
}

func ValidateProgressOutput(val string) (string, error) {

This comment has been minimized.

@AntaresS

AntaresS Aug 7, 2018

Contributor

Do you really need to return a string here?

This comment has been minimized.

@vdemeester

vdemeester Aug 7, 2018

Member

I think it's to respect the other validation Validate* signatures, that are able to mutate the value being validated. As we don't really use it into a type that require this signature (and as I'm not found of a validation function mutating the value it validates), I think we shouldn't return a string and just an error

@vdemeester
Copy link
Member

vdemeester left a comment

Design LGTM
Small comment on the code, and there is a linter issue too 👼

@@ -308,6 +307,16 @@ func ValidateSysctl(val string) (string, error) {
return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
}

func ValidateProgressOutput(val string) (string, error) {

This comment has been minimized.

@vdemeester

vdemeester Aug 7, 2018

Member

I think it's to respect the other validation Validate* signatures, that are able to mutate the value being validated. As we don't really use it into a type that require this signature (and as I'm not found of a validation function mutating the value it validates), I think we shouldn't return a string and just an error

@tiborvass tiborvass force-pushed the tiborvass:buildkit-progress-flag branch from 60be7af to 31fccd0 Aug 7, 2018

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Aug 7, 2018

Codecov Report

Merging #1276 into master will increase coverage by 0.02%.
The diff coverage is 25%.

@@            Coverage Diff             @@
##           master    #1276      +/-   ##
==========================================
+ Coverage   54.29%   54.32%   +0.02%     
==========================================
  Files         268      268              
  Lines       17855    17847       -8     
==========================================
  Hits         9695     9695              
+ Misses       7550     7542       -8     
  Partials      610      610
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.

In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.

Signed-off-by: Tibor Vass <tibor@docker.com>

@tiborvass tiborvass force-pushed the tiborvass:buildkit-progress-flag branch from 31fccd0 to faeb8bb Aug 7, 2018

@tiborvass

This comment has been minimized.

Copy link
Contributor Author

tiborvass commented Aug 7, 2018

@vdemeester
Copy link
Member

vdemeester left a comment

LGTM 🐯

@AntaresS
Copy link
Contributor

AntaresS left a comment

LGTM

@tiborvass tiborvass merged commit 9641739 into docker:master Aug 16, 2018

8 of 9 checks passed

codecov/patch 25% of diff hit (target 50%)
Details
ci/circleci: cross Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: shellcheck Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
ci/circleci: validate Your tests passed on CircleCI!
Details
codecov/project 54.32% (+0.02%) compared to 1d04f7d
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
dco-signed All commits are signed

@GordonTheTurtle GordonTheTurtle added this to the 18.09.0 milestone Aug 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.