1
0
mirror of https://github.com/openshift/source-to-image.git synced 2026-02-05 12:44:54 +01:00

Merge pull request #679 from bparees/src_info

Merged by openshift-bot
This commit is contained in:
OpenShift Bot
2017-01-21 20:42:19 -05:00
committed by GitHub
2 changed files with 7 additions and 0 deletions

View File

@@ -238,6 +238,10 @@ type Config struct {
// must have non-zero length. The labels defined here override generated labels in case
// they have the same name.
Labels map[string]string
// SourceInfo provides the info about the source to be built rather than relying
// on the Downloader to retrieve it.
SourceInfo *SourceInfo
}
// EnvironmentSpec specifies a single environment variable.

View File

@@ -348,6 +348,9 @@ func (builder *STI) Prepare(config *api.Config) error {
)
return err
}
if config.SourceInfo != nil {
builder.sourceInfo = config.SourceInfo
}
}
// get the scripts