Skip to content

Commit 25893bb

Browse files
mlohvynenkoal1img
authored andcommitted
[launcher] Fix override env var if entry exists
Signed-off-by: Mykhailo Lohvynenko <Mykhailo_Lohvynenko@epam.com>
1 parent 769ef62 commit 25893bb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

launcher/spec.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,6 @@ func (launcher *Launcher) createRuntimeSpec(instance *runtimeInstanceInfo) (*run
544544
spec.bindHostDirs(launcher.config.WorkingDir)
545545
spec.setNamespacePath(runtimespec.NetworkNamespace, launcher.networkManager.GetNetnsPath(instance.InstanceID))
546546
spec.mergeEnv(createAosEnvVars(instance))
547-
instance.overrideEnvVars = launcher.getInstanceEnvVars(instance.InstanceInfo)
548-
spec.mergeEnv(instance.overrideEnvVars)
549547

550548
if instance.StatePath != "" {
551549
absStatePath := launcher.getAbsStatePath(instance.StatePath)
@@ -583,6 +581,9 @@ func (launcher *Launcher) createRuntimeSpec(instance *runtimeInstanceInfo) (*run
583581
return nil, err
584582
}
585583

584+
instance.overrideEnvVars = launcher.getInstanceEnvVars(instance.InstanceInfo)
585+
spec.mergeEnv(instance.overrideEnvVars)
586+
586587
fileName := filepath.Join(instance.runtimeDir, runtimeConfigFile)
587588

588589
log.WithFields(instanceLogFields(instance, log.Fields{"fileName": fileName})).Debug("Save runtime spec")

0 commit comments

Comments
 (0)