fix: don't include env vars in base context

Author: uadnan

strong_opx/project/environment.py

@@ -50,9 +50,10 @@ def get_context_hooks(self) -> tuple[Callable[["Context"], None], ...]:
         )
 
     def create_context(self) -> Context:
-        context = Context(self.vars)
-        context["ENVIRONMENT"] = self.name
-        context["DOCKER_REGISTRY"] = current_docker_registry(self)
+        context = Context({
+            "ENVIRONMENT": self.name,
+            "DOCKER_REGISTRY": current_docker_registry(self)
+        })
 
         for hook in self.get_context_hooks():
             hook(context)
@@ -66,6 +67,7 @@ def vault_secret(self):
     @cached_property
     def context(self) -> Context:
         context = self.base_context.chain()
+        context.update(self.vars)
 
         var_paths = self.project.vars_config.get_paths(self)
         for file_path in var_paths:

strong_opx/providers/docker_registry.py

@@ -93,3 +93,5 @@ def current_docker_registry(environment: "Environment") -> Optional[AbstractDock
     )
     if registry_class:
         return registry_class(environment)
+
+    return None