grim/convey

Add a docker/build task for backwards compatibility
redux
2021-10-11, Gary Kramlich
ee239409c3de
Parents d434a60a38b3
Children 82d28cf8e74d
Add a docker/build task for backwards compatibility
2 files changed, 53 insertions(+), 0 deletions(-)
  • +52 -0
    docker/build.go
  • +1 -0
    docker/tasks.go
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/docker/build.go Mon Oct 11 07:07:06 2021 -0500
    @@ -0,0 +1,52 @@
    +package docker
    +
    +import (
    + "fmt"
    +
    + log "github.com/sirupsen/logrus"
    +
    + "keep.imfreedom.org/grim/convey/environment"
    + "keep.imfreedom.org/grim/convey/podman"
    + "keep.imfreedom.org/grim/convey/runtime"
    + "keep.imfreedom.org/grim/convey/tasks"
    + "keep.imfreedom.org/grim/convey/yaml"
    +)
    +
    +type Build struct {
    + Dockerfile string `yaml:"dockerfile"`
    + Files yaml.StringOrSlice `yaml:"files"`
    + Tag string `yaml:"tag"`
    + Tags yaml.StringOrSlice `yaml:"tags"`
    + Target string `yaml:"target"`
    + Labels yaml.StringOrSlice `yaml:"labels"`
    + Arguments yaml.StringOrSlice `yaml:"arguments"`
    +
    + realBuild *podman.Build
    +}
    +
    +func (b *Build) Execute(name string, logger *log.Entry, stageEnv environment.Environment, rt *runtime.Runtime) error {
    + return b.realBuild.Execute(name, logger, stageEnv, rt)
    +}
    +
    +func (b *Build) New() tasks.Task {
    + return &Build{}
    +}
    +
    +func (b *Build) Valid() error {
    + if b.Tag != "" {
    + b.Tags = append([]string{b.Tag}, b.Tags...)
    + }
    +
    + b.realBuild = &podman.Build{
    + Annotations: b.Labels,
    + Containerfile: b.Dockerfile,
    + Tags: b.Tags,
    + Target: b.Target,
    + }
    +
    + return b.realBuild.Valid()
    +}
    +
    +func (b *Build) Deprecated() error {
    + return fmt.Errorf("docker/build has been deprecated in favor of podman/build since 0.15.0")
    +}
    --- a/docker/tasks.go Mon Oct 11 06:53:39 2021 -0500
    +++ b/docker/tasks.go Mon Oct 11 07:07:06 2021 -0500
    @@ -6,6 +6,7 @@
    var (
    Tasks = map[string]tasks.Task{
    + "docker/build": &Build{},
    "docker/import": &Import{},
    "docker/environment": &Environment{},
    "docker/export": &Export{},