resources: properly handle omit with env param after nvidia changes

saltyorg · Sep 1, 2024 · f266104 · f266104
1 parent 5a00367
commit f266104
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/resources/tasks/docker/create_docker_container.yml b/resources/tasks/docker/create_docker_container.yml
@@ -47,7 +47,8 @@
     domainname: "{{ lookup('vars', _var_prefix + '_docker_domainname', default=omit) }}"
     entrypoint: "{{ lookup('vars', _var_prefix + '_docker_entrypoint', default=omit) }}"
     env: "{{ (nvidia_docker_env if use_nvidia else {})
-             | combine(lookup('vars', _var_prefix + '_docker_envs', default=omit)) }}"
+             | combine(lookup('vars', _var_prefix + '_docker_envs', default={}))
+             | default(omit) }}"
     env_file: "{{ lookup('vars', _var_prefix + '_docker_env_file', default=omit) }}"
     etc_hosts: "{{ lookup('vars', _var_prefix + '_docker_hosts', default=omit)
                 if not ('container:' in lookup('vars', _var_prefix + '_docker_network_mode', default=docker_networks_name_common))