make build output optional #1119
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/fsouza/go-dockerclient" | ||
| "github.com/golang/glog" | ||
| "github.com/openshift/origin/pkg/api/latest" | ||
| "github.com/openshift/origin/pkg/build/api" | ||
| bld "github.com/openshift/origin/pkg/build/builder" | ||
|
|
@@ -29,34 +29,40 @@ type factoryFunc func( | |
| func run(builderFactory factoryFunc) { | ||
| client, endpoint, err := dockerutil.NewHelper().GetClient() | ||
| if err != nil { | ||
| glog.Fatalf("Error obtaining docker client: %v", err) | ||
| } | ||
| buildStr := os.Getenv("BUILD") | ||
| build := api.Build{} | ||
| if err := latest.Codec.DecodeInto([]byte(buildStr), &build); err != nil { | ||
| glog.Fatalf("Unable to parse build: %v", err) | ||
| } | ||
|
|
||
| var ( | ||
| authcfg docker.AuthConfiguration | ||
| authPresent bool | ||
| ) | ||
| output := true | ||
| if len(build.Parameters.Output.DockerImageReference) == 0 { | ||
| if build.Parameters.Output.To != nil { | ||
| glog.Fatalf("Cannot determine an output image reference. Make sure a registry service is running.") | ||
| } | ||
| output = false | ||
| } | ||
| if output { | ||
| registry, _, _, _, err := image.SplitDockerPullSpec(build.Parameters.Output.DockerImageReference) | ||
| if err != nil { | ||
| glog.Fatalf("Build output does not have a valid Docker image reference: %v", err) | ||
| } | ||
| authcfg, authPresent = dockercfg.NewHelper().GetDockerAuth(registry) | ||
| } | ||
| b := builderFactory(client, endpoint, authcfg, authPresent, &build) | ||
| if err = b.Build(); err != nil { | ||
|
Contributor
There was a problem hiding this comment. STI build will fail here, since not passing the name of the output image which is required (see sti.go#34).
Contributor
Contributor
There was a problem hiding this comment. OK, we pass the name, so we're missing a TC for this one, please 😸
Contributor
Author
There was a problem hiding this comment. Seems like you better make the output optional when that loophole gets fixed. what sort of a test case are you asking for? an origin test case that runs sti-type builds w/ no output defined?
Contributor
There was a problem hiding this comment. Here's the issue openshift/source-to-image#146, I'll be working on PR for that, so you can assign me to that bug. |
||
| glog.Fatalf("Build error: %v", err) | ||
| } | ||
| if !output { | ||
| glog.Warning("Build does not have an Output defined, no output image was pushed to a registry.") | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // RunDockerBuild creates a docker builder and runs its build | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this condition you'll still end build when
Tois not defined and if I understood @smarterclayton correctly he wanted to have no output defined at all.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, if Output.To==nil we'll fall through to "output=false" but still run the build, which is as desired.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
K