grim/convey

Add new extend parameters for splits; revert env autosplit in docker tasks.
auto-split
2017-09-21, Eric Fritz
8b0dc7be36f2
Parents 955b9c1d8976
Children caa707f4e2d1
Add new extend parameters for splits; revert env autosplit in docker tasks.
9 files changed, 12 insertions(+), 10 deletions(-)
  • +1 -1
    docker/build.go
  • +1 -1
    docker/export.go
  • +1 -1
    docker/import.go
  • +1 -1
    docker/pull.go
  • +1 -1
    docker/push.go
  • +1 -1
    docker/remove.go
  • +1 -1
    docker/run.go
  • +1 -1
    docker/tag.go
  • +4 -2
    intrinsic/extend.go
    • --- a/docker/build.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/build.go Thu Sep 21 15:49:08 2017 -0500
    @@ -48,7 +48,7 @@
    func (b *Build) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - files, err := environment.SliceMapExpander(b.Files, fullEnv)
    + files, err := environment.SliceMapper(b.Files, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/export.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/export.go Thu Sep 21 15:49:08 2017 -0500
    @@ -86,7 +86,7 @@
    func (e *Export) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - files, err := environment.SliceMapExpander(e.Files, fullEnv)
    + files, err := environment.SliceMapper(e.Files, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/import.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/import.go Thu Sep 21 15:49:08 2017 -0500
    @@ -35,7 +35,7 @@
    func (i *Import) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - files, err := environment.SliceMapExpander(i.Files, fullEnv)
    + files, err := environment.SliceMapper(i.Files, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/pull.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/pull.go Thu Sep 21 15:49:08 2017 -0500
    @@ -36,7 +36,7 @@
    func (p *Pull) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - images, err := environment.SliceMapExpander(p.Images, fullEnv)
    + images, err := environment.SliceMapper(p.Images, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/push.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/push.go Thu Sep 21 15:49:08 2017 -0500
    @@ -36,7 +36,7 @@
    func (p *Push) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - images, err := environment.SliceMapExpander(p.Images, fullEnv)
    + images, err := environment.SliceMapper(p.Images, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/remove.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/remove.go Thu Sep 21 15:49:08 2017 -0500
    @@ -36,7 +36,7 @@
    func (r *Remove) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    fullEnv := environment.Merge(env, st.Environment)
    - images, err := environment.SliceMapExpander(r.Images, fullEnv)
    + images, err := environment.SliceMapper(r.Images, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/run.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/run.go Thu Sep 21 15:49:08 2017 -0500
    @@ -198,7 +198,7 @@
    return err
    }
    - labels, err := environment.SliceMapExpander(r.Labels, fullEnv)
    + labels, err := environment.SliceMapper(r.Labels, fullEnv)
    if err != nil {
    return err
    }
    --- a/docker/tag.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/docker/tag.go Thu Sep 21 15:49:08 2017 -0500
    @@ -42,7 +42,7 @@
    return err
    }
    - destinations, err := environment.SliceMapExpander(t.Destinations, fullEnv)
    + destinations, err := environment.SliceMapper(t.Destinations, fullEnv)
    if err != nil {
    return err
    }
    --- a/intrinsic/extend.go Wed Sep 20 20:43:49 2017 -0500
    +++ b/intrinsic/extend.go Thu Sep 21 15:49:08 2017 -0500
    @@ -30,8 +30,10 @@
    )
    type Extend struct {
    - Task string `yaml:"task"`
    - Environment yaml.StringOrSlice `yaml:"environment"`
    + Task string `yaml:"task"`
    + Environment yaml.StringOrSlice `yaml:"environment"`
    + Split yaml.StringOrSlice `yaml:"split"`
    + SplitDelimiter string `yaml:"split_delimiter" default:";"`
    // A copy of the extended task. Must be public so that deepcopy
    // can serialize it properly in case an extended task is extended