Skip to content

Commit

Permalink
Fix integration test
Browse files Browse the repository at this point in the history
  • Loading branch information
Priya Wadhwa committed Sep 11, 2018
1 parent 5d2d282 commit 4be4f72
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM scratch AS first
FROM gcr.io/distroless/base@sha256:628939ac8bf3f49571d05c6c76b8688cb4a851af6c7088e599388259875bde20 AS first
CMD ["mycmd"]

FROM first
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func reviewConfig(stage config.KanikoStage, config *v1.Config) error {
}
}
if entrypoint && !cmd {
config.Cmd = []string{}
config.Cmd = nil
}
return nil
}
2 changes: 1 addition & 1 deletion pkg/executor/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func Test_reviewConfig(t *testing.T) {
ENTRYPOINT ["myentrypoint"]`,
originalEntrypoint: []string{"myentrypoint"},
originalCmd: []string{"mycmd"},
expectedCmd: []string{},
expectedCmd: nil,
},
}
for _, test := range tests {
Expand Down

0 comments on commit 4be4f72

Please sign in to comment.