Updated stpsignal to use arg, and createdby field

GoogleContainerTools · May 2, 2018 · 805244b · 805244b
1 parent 829ce12
commit 805244b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/pkg/commands/arg.go b/pkg/commands/arg.go
@@ -21,6 +21,7 @@ import (
 	"github.com/docker/docker/builder/dockerfile/instructions"
 	"github.com/google/go-containerregistry/v1"
 	"github.com/sirupsen/logrus"
+	"strings"
 )
 
 type ArgCommand struct {
@@ -38,3 +39,8 @@ func (r *ArgCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.Bui
 func (r *ArgCommand) FilesToSnapshot() []string {
 	return []string{}
 }
+
+// CreatedBy returns some information about the command for the image config history
+func (r *ArgCommand) CreatedBy() string {
+	return strings.Join([]string{r.cmd.Name(), r.cmd.Key}, " ")
+}
diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go
@@ -30,6 +30,8 @@ type DockerCommand interface {
 	//  2. Updating metadata fields in the config
 	// It should not change the config history.
 	ExecuteCommand(*v1.Config, *dockerfile.BuildArgs) error
+	// The config history has a "created by" field, should return information about the command
+	CreatedBy() string
 	// A list of files to snapshot, empty for metadata commands or nil if we don't know
 	FilesToSnapshot() []string
 }

diff --git a/pkg/commands/stopsignal.go b/pkg/commands/stopsignal.go
@@ -17,25 +17,26 @@ limitations under the License.
 package commands
 
 import (
-	"strings"
-
+	"github.com/GoogleContainerTools/kaniko/pkg/dockerfile"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
 	"github.com/docker/docker/builder/dockerfile/instructions"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/google/go-containerregistry/v1"
 	"github.com/sirupsen/logrus"
+	"strings"
 )
 
 type StopSignalCommand struct {
 	cmd *instructions.StopSignalCommand
 }
 
 // ExecuteCommand handles command processing similar to CMD and RUN,
-func (s *StopSignalCommand) ExecuteCommand(config *v1.Config) error {
+func (s *StopSignalCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.BuildArgs) error {
 	logrus.Info("cmd: STOPSIGNAL")
 
 	// resolve possible environment variables
-	resolvedEnvs, err := util.ResolveEnvironmentReplacementList([]string{s.cmd.Signal}, config.Env, false)
+	b := buildArgs.FilterAllowed(config.Env)
+	resolvedEnvs, err := util.ResolveEnvironmentReplacementList([]string{s.cmd.Signal}, append(config.Env, b...), false)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/commands/stopsignal_test.go b/pkg/commands/stopsignal_test.go
@@ -16,11 +16,11 @@ limitations under the License.
 package commands
 
 import (
-	"testing"
-
+	"github.com/GoogleContainerTools/kaniko/pkg/dockerfile"
 	"github.com/GoogleContainerTools/kaniko/testutil"
 	"github.com/docker/docker/builder/dockerfile/instructions"
 	"github.com/google/go-containerregistry/v1"
+	"testing"
 )
 
 var stopsignalTests = []struct {
@@ -54,7 +54,8 @@ func TestStopsignalExecuteCmd(t *testing.T) {
 				Signal: test.signal,
 			},
 		}
-		err := cmd.ExecuteCommand(cfg)
+		b := dockerfile.NewBuildArgs([]string{})
+		err := cmd.ExecuteCommand(cfg, b)
 		testutil.CheckErrorAndDeepEqual(t, false, err, test.expectedSignal, cfg.StopSignal)
 	}
 }