diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 742fd5ef3..3889a9ffd 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -42,6 +42,8 @@ func GetCommand(cmd instructions.Command) (DockerCommand, error) { return &ExposeCommand{cmd: c}, nil case *instructions.EnvCommand: return &EnvCommand{cmd: c}, nil + case *instructions.LabelCommand: + return &LabelCommand{cmd: c}, nil } return nil, errors.Errorf("%s is not a supported command", cmd.Name()) } diff --git a/pkg/commands/expose.go b/pkg/commands/expose.go index daf4dc781..716b03294 100644 --- a/pkg/commands/expose.go +++ b/pkg/commands/expose.go @@ -69,6 +69,6 @@ func (r *ExposeCommand) FilesToSnapshot() []string { } func (r *ExposeCommand) CreatedBy() string { - s := []string{"/bin/sh", "-c"} + s := []string{r.cmd.Name()} return strings.Join(append(s, r.cmd.Ports...), " ") } diff --git a/pkg/commands/label.go b/pkg/commands/label.go new file mode 100644 index 000000000..d83811eec --- /dev/null +++ b/pkg/commands/label.go @@ -0,0 +1,57 @@ +/* +Copyright 2018 Google LLC + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package commands + +import ( + "github.com/containers/image/manifest" + "github.com/docker/docker/builder/dockerfile/instructions" + "github.com/sirupsen/logrus" + "strings" +) + +type LabelCommand struct { + cmd *instructions.LabelCommand +} + +func (r *LabelCommand) ExecuteCommand(config *manifest.Schema2Config) error { + return updateLabels(r.cmd.Labels, config) +} + +func updateLabels(labels []instructions.KeyValuePair, config *manifest.Schema2Config) error { + existingLabels := config.Labels + + for _, kvp := range labels { + logrus.Infof("Applying label %s=%s", kvp.Key, kvp.Value) + existingLabels[kvp.Key] = kvp.Value + } + + config.Labels = existingLabels + return nil + +} + +func (r *LabelCommand) FilesToSnapshot() []string { + return []string{} +} + +func (r *LabelCommand) CreatedBy() string { + l := []string{r.cmd.Name()} + for _, kvp := range r.cmd.Labels { + l = append(l, kvp.String()) + } + return strings.Join(l, " ") +} diff --git a/pkg/commands/label_test.go b/pkg/commands/label_test.go new file mode 100644 index 000000000..9567f6150 --- /dev/null +++ b/pkg/commands/label_test.go @@ -0,0 +1,34 @@ +package commands + +import ( + "github.com/GoogleCloudPlatform/k8s-container-builder/testutil" + "github.com/containers/image/manifest" + "github.com/docker/docker/builder/dockerfile/instructions" + "testing" +) + +func TestUpdateLabels(t *testing.T) { + cfg := &manifest.Schema2Config{ + Labels: map[string]string { + "foo": "bar", + }, + } + + labels := []instructions.KeyValuePair{ + { + Key: "foo", + Value: "override", + }, + { + Key: "bar", + Value: "baz", + }, + } + + expectedLabels := map[string]string { + "foo": "override", + "bar": "baz", + } + updateLabels(labels, cfg) + testutil.CheckErrorAndDeepEqual(t, false, nil, expectedLabels, cfg.Labels) +}