public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Check if config fields are nil

This commit is contained in:
Priya Wadhwa 2018-04-13 13:54:52 -07:00
parent 20b659aa32
commit a8ecbbd365
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/expose.go
View File

@ -33,6 +33,9 @@ func (r *ExposeCommand) ExecuteCommand(config *manifest.Schema2Config) error {
logrus.Info("cmd: EXPOSE") logrus.Info("cmd: EXPOSE")
// Grab the currently exposed ports // Grab the currently exposed ports
existingPorts := config.ExposedPorts existingPorts := config.ExposedPorts
if existingPorts == nil {
existingPorts = make(map[manifest.Schema2Port]struct{})
}
// Add any new ones in // Add any new ones in
for _, p := range r.cmd.Ports { for _, p := range r.cmd.Ports {
// Resolve any environment variables // Resolve any environment variables

4
pkg/commands/label.go
View File

@ -35,7 +35,9 @@ func (r *LabelCommand) ExecuteCommand(config *manifest.Schema2Config) error {
func updateLabels(labels []instructions.KeyValuePair, config *manifest.Schema2Config) error { func updateLabels(labels []instructions.KeyValuePair, config *manifest.Schema2Config) error {
existingLabels := config.Labels existingLabels := config.Labels
if existingLabels == nil {
existingLabels = make(map[string]string)
}
// Let's unescape values before setting the label // Let's unescape values before setting the label
for index, kvp := range labels { for index, kvp := range labels {
unescaped, err := util.ResolveEnvironmentReplacement(kvp.Value, []string{}, false) unescaped, err := util.ResolveEnvironmentReplacement(kvp.Value, []string{}, false)