From 04b5fc19c25f6cb8913cc27afb928f4e47ef2f20 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 18 Oct 2020 09:51:11 +0100 Subject: [PATCH] change build interface --- build/build.go | 4 +++- build/docker/docker.go | 3 ++- build/golang/golang.go | 3 ++- build/tar/tar.go | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build/build.go b/build/build.go index 1b7cc2b0..02f1db48 100644 --- a/build/build.go +++ b/build/build.go @@ -4,13 +4,15 @@ package build // Build is an interface for building packages type Build interface { // Package builds a package - Package(name string, src *Source) (*Package, error) + Package(*Source) (*Package, error) // Remove removes the package Remove(*Package) error } // Source is the source of a build type Source struct { + // Name of the source + Name string // Path to the source if local Path string // Language is the language of code diff --git a/build/docker/docker.go b/build/docker/docker.go index 02774d09..7402cd08 100644 --- a/build/docker/docker.go +++ b/build/docker/docker.go @@ -18,7 +18,8 @@ type dockerBuild struct { Client *docker.Client } -func (d *dockerBuild) Package(name string, s *build.Source) (*build.Package, error) { +func (d *dockerBuild) Package(s *build.Source) (*build.Package, error) { + name := s.Name image := name buf := new(bytes.Buffer) diff --git a/build/golang/golang.go b/build/golang/golang.go index 5af763fd..fd7914b6 100644 --- a/build/golang/golang.go +++ b/build/golang/golang.go @@ -34,7 +34,8 @@ func whichGo() string { return "go" } -func (g *goBuild) Package(name string, src *build.Source) (*build.Package, error) { +func (g *goBuild) Package(src *build.Source) (*build.Package, error) { + name := src.Name binary := filepath.Join(g.Path, name) source := src.Path diff --git a/build/tar/tar.go b/build/tar/tar.go index 6cfa0730..bc06a1e1 100644 --- a/build/tar/tar.go +++ b/build/tar/tar.go @@ -10,7 +10,8 @@ import ( type tarBuild struct{} -func (t *tarBuild) Package(name string, src *build.Source) (*build.Package, error) { +func (t *tarBuild) Package(src *build.Source) (*build.Package, error) { + name := src.Name pkg := name + ".tar.gz" // path to the tarball path := filepath.Join(os.TempDir(), src.Path, pkg)