Commit 25893bb 1 parent 769ef62 commit 25893bb Copy full SHA for 25893bb
File tree 1 file changed +3
-2
lines changed
1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -544,8 +544,6 @@ func (launcher *Launcher) createRuntimeSpec(instance *runtimeInstanceInfo) (*run
544
544
spec .bindHostDirs (launcher .config .WorkingDir )
545
545
spec .setNamespacePath (runtimespec .NetworkNamespace , launcher .networkManager .GetNetnsPath (instance .InstanceID ))
546
546
spec .mergeEnv (createAosEnvVars (instance ))
547
- instance .overrideEnvVars = launcher .getInstanceEnvVars (instance .InstanceInfo )
548
- spec .mergeEnv (instance .overrideEnvVars )
549
547
550
548
if instance .StatePath != "" {
551
549
absStatePath := launcher .getAbsStatePath (instance .StatePath )
@@ -583,6 +581,9 @@ func (launcher *Launcher) createRuntimeSpec(instance *runtimeInstanceInfo) (*run
583
581
return nil , err
584
582
}
585
583
584
+ instance .overrideEnvVars = launcher .getInstanceEnvVars (instance .InstanceInfo )
585
+ spec .mergeEnv (instance .overrideEnvVars )
586
+
586
587
fileName := filepath .Join (instance .runtimeDir , runtimeConfigFile )
587
588
588
589
log .WithFields (instanceLogFields (instance , log.Fields {"fileName" : fileName })).Debug ("Save runtime spec" )
You can’t perform that action at this time.
0 commit comments