builder/cli/daemon: integrate with buildkit@v0.3.3 #2779
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #2779 +/- ##
==========================================
+ Coverage 67.27% 69.12% +1.84%
==========================================
Files 279 285 +6
Lines 17603 17754 +151
==========================================
+ Hits 11842 12272 +430
+ Misses 4429 4083 -346
- Partials 1332 1399 +67
|
fuweid
changed the title
zhuangqh
approved these changes
Apr 17, 2019
| if d.config.EnableBuilder { | ||
| go func() { | ||
| logrus.Info("serving builder server...") | ||
| if err := d.runBuilderServer(); err != nil { |
There was a problem hiding this comment.
There are three type of service here, cri service, http server and builder server. A little messy to start them. We can make an abstract interface from them and manage them uniformity later.
There was a problem hiding this comment.
if builder is enabled and start builder server failed, it is an error not a warning.
cli/build/opts.go
Outdated
| } | ||
| namedRef = reference.TrimTagForDigest(reference.WithDefaultTagIfMissing(namedRef)) | ||
| tagList = append(tagList, namedRef.String()) | ||
|
|
v0.4.0 version of buildkit is using very higher golang version. We don't
want to follow this so fast. This is why we use v0.3.3 here.
Using following command to add the packages:
govendor fetch github.com/moby/buildkit/...@v0.3.3
govendor fetch github.com/tonistiigi/fsutil@2862f6bc5ac9b97124e552a5c108230b38a1b0ca
govendor fetch github.com/hashicorp/go-immutable-radix::github.com/tonistiigi/go-immutable-radix@826af9ccf0feeee615d546d69b11f8e98da8c8f1
Signed-off-by: Wei Fu <fuweid89@gmail.com>
|
LGTM, greatly thanks for your work. |
pouchrobot
added
the
LGTM
yyb196
reviewed
May 7, 2019
| @@ -35,7 +35,8 @@ type Daemon struct { | |||
| ctrdDaemon *supervisord.Daemon | |||
|
|
|||
| // ctrdClient is grpc client connecting to the containerd | |||
| ctrdClient ctrd.APIClient | |||
| ctrdClient ctrd.APIClient | |||
|
|
|||
There was a problem hiding this comment.
it is already be format.
PouchContainer uses builkit to support build functionality. This is commit which brings very basic build functionality and there is a lot of improvements will be supported in following pull request. This builder functionality is controlled by daemon flag `--enable-builder`. By default, the builder is disable. If it is stable and under fully testing, we will make it enable by default. Signed-off-by: Wei Fu <fuweid89@gmail.com>
|
LGTM |
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.
Ⅰ. Describe what this PR did
PouchContainer uses builkit to support build functionality. This is
commit which brings very basic build functionality and there is a lot of
improvements will be supported in following pull request.
This builder functionality is controlled by daemon flag
--enable-builder. By default, the builder is disable. If it is stableand under fully testing, we will make it enable by default.
Ⅱ. Does this pull request fix one issue?
#1919
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
add one case
Ⅳ. Describe how to verify it
CI
Ⅴ. Special notes for reviews