Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.06] Set BuildKit's ExportedProduct variable to show useful errors in the future #21

Merged
merged 3 commits into from
Aug 7, 2018
Merged

[18.06] Set BuildKit's ExportedProduct variable to show useful errors in the future #21

merged 3 commits into from
Aug 7, 2018

Conversation

tiborvass
Copy link

Cherry-pick of moby#37439

@tiborvass tiborvass added this to the 18.06.0 milestone Jul 11, 2018
@tiborvass tiborvass changed the title 18.06 vendor buildkit [WIP] 18.06 vendor buildkit Jul 11, 2018
@tiborvass tiborvass changed the title [WIP] 18.06 vendor buildkit [18.06] [WIP] vendor buildkit Jul 11, 2018
@thaJeztah
Copy link
Member

Build is failing;

22:35:37 builder/dockerfile/dispatchers_test.go:141:3:warning: unknown field Key in struct literal (gosimple)
22:35:37 builder/dockerfile/dispatchers_test.go:142:3:warning: unknown field Value in struct literal (gosimple)
22:35:37 builder/dockerfile/dispatchers_test.go:139:2:warning: val declared but not used (gosimple)
22:35:37 builder/dockerfile/dispatchers_test.go:380:34:warning: unknown field Key in struct literal (gosimple)
22:35:37 builder/dockerfile/dispatchers_test.go:380:48:warning: unknown field Value in struct literal (gosimple)
22:35:38 Build step 'Execute shell' marked build as failure

@thaJeztah thaJeztah mentioned this pull request Jul 12, 2018
Merged
@tiborvass tiborvass force-pushed the 18.06-vendor-buildkit branch from b16cc40 to 046e3a5 Compare July 12, 2018 02:04
@tiborvass tiborvass changed the title [18.06] [WIP] vendor buildkit [18.06] [WIP] Set BuildKit's ExportedProduct variable to show useful errors in the future Jul 12, 2018
@tiborvass tiborvass force-pushed the 18.06-vendor-buildkit branch 3 times, most recently from fe8abfa to 50dc4d4 Compare July 13, 2018 21:48
@thaJeztah thaJeztah modified the milestones: 18.06.0, 18.06.1 Jul 20, 2018
Tibor Vass added 3 commits July 20, 2018 23:48
vendor: buildkit to 98f1604134f945d48538ffca0e18662337b4a850
918ea06 
Signed-off-by: Tibor Vass <[email protected]>
(cherry picked from commit 0ab7c1c)
Signed-off-by: Tibor Vass <[email protected]>
builder: set buildkit's exported product variable via PRODUCT
89a8e67 
This introduces a PRODUCT environment variable that is used to set a constant
at dockerversion.ProductName.

That is then used to set BuildKit's ExportedProduct variable in order to show
useful error messages to users when a certain version of the product doesn't
support a BuildKit feature.

Signed-off-by: Tibor Vass <[email protected]>
(cherry picked from commit 195919d)
Signed-off-by: Tibor Vass <[email protected]>
validate: please vet
0832d1e 
Signed-off-by: Tibor Vass <[email protected]>
(cherry picked from commit 8159922)
Signed-off-by: Tibor Vass <[email protected]>
@tiborvass tiborvass force-pushed the 18.06-vendor-buildkit branch from 50dc4d4 to 0832d1e Compare July 20, 2018 23:49
@tiborvass tiborvass changed the title [18.06] [WIP] Set BuildKit's ExportedProduct variable to show useful errors in the future [18.06] Set BuildKit's ExportedProduct variable to show useful errors in the future Jul 20, 2018
@tiborvass
Copy link
Author

Updated

thaJeztah
thaJeztah approved these changes Aug 7, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

andrewhsu
andrewhsu approved these changes Aug 7, 2018
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 576e49d into docker-archive:18.06 Aug 7, 2018
@andrewhsu andrewhsu mentioned this pull request Aug 8, 2018
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.06.1
Development

Successfully merging this pull request may close these issues.
3 participants
@tiborvass @thaJeztah @andrewhsu