docker-stack 0.2.2__tar.gz → 0.2.3__tar.gz

{docker-stack-0.2.2 → docker-stack-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: docker-stack
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI for deploying and managing Docker stacks.
 Home-page: https://github.com/mesuidp/docker-stack
 Author: Sudip Bhattarai

{docker-stack-0.2.2 → docker-stack-0.2.3}/docker_stack/cli.py

@@ -306,8 +306,14 @@ class DockerStack:
                 build_command = ["docker", "build", "-t", image]
               
                               
-                for  value in build_config.get('args', []):
-                    build_command.extend(["--build-arg", envsubst(value)])
+                args = build_config.get('args', [])
+
+                if isinstance(args, dict):
+                    for key, val in args.items():
+                        build_command.extend(["--build-arg", f"{envsubst(key)}={envsubst(val)}"])
+                elif isinstance(args, list):
+                    for value in args:
+                        build_command.extend(["--build-arg", envsubst(value)])
 
                 build_command.append(os.path.join(base_dir, build_config.get('context', '.')))
                 self.commands.append(Command(build_command))

{docker-stack-0.2.2 → docker-stack-0.2.3}/docker_stack/envsubst.py

@@ -25,6 +25,7 @@ def envsubst(template_str, env=os.environ):
     # Regex for $VARIABLE without default
     pattern_without_default = re.compile(r"\$([a-zA-Z_][a-zA-Z0-9_]*)")
 
+    template_str = template_str.replace("$$", "__ESCAPED_DOLLAR__")
     def print_error_line(template_str, match_span):
         """Helper function to print the error context."""
         lines = template_str.splitlines()
@@ -76,6 +77,8 @@ def envsubst(template_str, env=os.environ):
 
     # Substitute variables without default values
     template_str = pattern_without_default.sub(replace_without_default, template_str)
+    
+    template_str = template_str.replace("__ESCAPED_DOLLAR__", "$")
 
     return template_str
 
@@ -103,3 +106,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+

{docker-stack-0.2.2 → docker-stack-0.2.3}/docker_stack/helpers.py

@@ -1,4 +1,5 @@
 import subprocess
+import sys
 from typing import List, Optional
 
 
@@ -101,7 +102,9 @@ class Command:
             #     process.wait()
             #     return process
             # else:
-            return subprocess.run(self.command)
+            result= subprocess.run(self.command)
+            if result.returncode!= 0:
+                sys.exit(result.returncode)
         else:
             return run_cli_command(self.command, stdin=self.stdin, log=False, shell=False,cwd=self.cwd)
 

{docker-stack-0.2.2 → docker-stack-0.2.3}/docker_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: docker-stack
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI for deploying and managing Docker stacks.
 Home-page: https://github.com/mesuidp/docker-stack
 Author: Sudip Bhattarai

{docker-stack-0.2.2 → docker-stack-0.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="docker-stack",
-    version="0.2.2",
+    version="0.2.3",
     description="CLI for deploying and managing Docker stacks.",
     long_description=open("README.md").read(),  # You can include a README file to describe your package
     long_description_content_type="text/markdown",