portmgr 1.7.0.dev1__tar.gz → 1.8.0.dev0__tar.gz

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/PKG-INFO

@@ -1,23 +1,20 @@
 Metadata-Version: 2.4
 Name: portmgr
-Version: 1.7.0.dev1
+Version: 1.8.0.dev0
 Summary: Simple command interface to manage multiple Docker container
 Home-page: https://github.com/Craeckie/portmgr
-License: Creative Commons Attribution-Noncommercial-Share Alike license
+License-Expression: MIT
+Project-URL: Website, https://github.com/Craeckie/portmgr
+Project-URL: Repository, https://github.com/Craeckie/portmgr.git
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: jsonschema
-Requires-Dist: tabulate
-Requires-Dist: PyYAML
-Requires-Dist: jsonschema
-Requires-Dist: humanfriendly
-Dynamic: description
-Dynamic: description-content-type
+Requires-Dist: humanfriendly~=10.0
+Requires-Dist: jsonschema~=3.2.0
+Requires-Dist: pyyaml~=6.0.2
+Requires-Dist: tabulate~=0.8.9
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # portmgr
 portmgr is a wrapper around [docker-compose](https://docs.docker.com/compose/) that allows running typical docker-compose commands recursively. Additionally, it shortens commands to a single letter.

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/portmgr/__init__.py

@@ -1,2 +1,2 @@
 from .portmgr import main, command_list, bcolors
-from .wrapper import runCompose
+from .wrapper import runCompose, runBuildx

portmgr-1.8.0.dev0/portmgr/commands/push.py

@@ -0,0 +1,76 @@
+from portmgr import command_list, bcolors, runCompose, runBuildx
+import subprocess
+import os
+
+from portmgr.wrapper import getServices
+
+
+def func(action):
+    directory = action['directory']
+    relative = action['relative']
+
+    services = getServices(includeOnlyBuildable=True)
+
+    print('Services to build: ' + ', '.join(services))
+
+    res = 0
+    for service in services.keys():
+        print(f"\nBuilding {service}")
+
+        new_res = 2
+        if multi_platform := os.environ.get("PORTMGR_MULTI_PLATFORM", "").lower():
+            try:
+                new_res = runBuildx(
+                    ['bake',
+                     '--pull',
+                     '--push',
+                     '--set', f'*.platform={multi_platform}',
+                     service
+                     ], timeout=1200 #kill after 20mins
+                )
+                if new_res != 0:
+                    res = new_res
+                    print(f"Error building {service}!")
+            except TimeoutExpired:
+                print(f"Error building {service}! Build timed out.")
+        else:
+            try:
+                new_res = runCompose(
+                        ['build',
+                         '--pull',
+                         '--force-rm',
+                         '--compress',
+                         service
+                         ], timeout=1200
+                        )
+                if new_res != 0:
+                    res = new_res
+                    print(f"Error building {service}!")
+                else:
+                    new_res = runCompose(
+                            ['push',
+                             '--ignore-push-failures',
+                             service
+                             ]
+                            )
+                print(f"Error pushing {service}!")
+            except TimeoutExpired:
+                print(f"Error building {service}! Build timed out.")
+            if new_res != 1:
+                res = new_res
+        if os.environ.get("PORTMGR_CLEAN_AFTER_PUSH", "").lower() == "true":
+            subprocess.call(['docker', 'system', 'prune', '--all', '--force'])
+            subprocess.call(['docker', 'buildx', 'prune', '--all', '--force'])
+
+    if res != 0:
+        print("Error building&pushing " + relative + "!")
+        return res
+
+    return res
+
+
+command_list['r'] = {
+    'hlp': 'build, push to registry & remove image',
+    'ord': 'nrm',
+    'fnc': func
+}

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/portmgr/wrapper.py

@@ -1,6 +1,6 @@
 import json
 import os
-from subprocess import call, check_output
+from subprocess import run, check_output
 
 
 def getServices(includeOnlyBuildable=False):
@@ -59,9 +59,9 @@ def runCompose(args, **kwargs):
     if os.environ.get("PORTMGR_IN_SCRIPT", "").lower() == "true":
         command += ["--ansi", "never"]
     command += list(args)
-    return call(command, **kwargs)
+    return run(command, **kwargs).returncode
 
 def runBuildx(args, **kwargs):
     command = ['docker', 'buildx']
     command += list(args)
-    return call(command, **kwargs)
+    return run(command, **kwargs).returncode

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/portmgr.egg-info/PKG-INFO

@@ -1,23 +1,20 @@
 Metadata-Version: 2.4
 Name: portmgr
-Version: 1.7.0.dev1
+Version: 1.8.0.dev0
 Summary: Simple command interface to manage multiple Docker container
 Home-page: https://github.com/Craeckie/portmgr
-License: Creative Commons Attribution-Noncommercial-Share Alike license
+License-Expression: MIT
+Project-URL: Website, https://github.com/Craeckie/portmgr
+Project-URL: Repository, https://github.com/Craeckie/portmgr.git
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: jsonschema
-Requires-Dist: tabulate
-Requires-Dist: PyYAML
-Requires-Dist: jsonschema
-Requires-Dist: humanfriendly
-Dynamic: description
-Dynamic: description-content-type
+Requires-Dist: humanfriendly~=10.0
+Requires-Dist: jsonschema~=3.2.0
+Requires-Dist: pyyaml~=6.0.2
+Requires-Dist: tabulate~=0.8.9
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: summary
 
 # portmgr
 portmgr is a wrapper around [docker-compose](https://docs.docker.com/compose/) that allows running typical docker-compose commands recursively. Additionally, it shortens commands to a single letter.

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/portmgr.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 LICENSE
 README.md
+pyproject.toml
 setup.py
 portmgr/__init__.py
 portmgr/__main__.py

portmgr-1.8.0.dev0/portmgr.egg-info/requires.txt

@@ -0,0 +1,4 @@
+humanfriendly~=10.0
+jsonschema~=3.2.0
+pyyaml~=6.0.2
+tabulate~=0.8.9

portmgr-1.8.0.dev0/pyproject.toml

@@ -0,0 +1,18 @@
+[project]
+name = "portmgr"
+version = "1.8.0dev0"
+description = "Simple command interface to manage multiple Docker container"
+readme = "README.md"
+license = "MIT"
+requires-python = ">=3.12"
+dependencies = [
+    "humanfriendly~=10.0",
+    "jsonschema~=3.2.0",
+    "pyyaml~=6.0.2",
+    "tabulate~=0.8.9",
+]
+[project.urls]
+Website = "https://github.com/Craeckie/portmgr"
+Repository = "https://github.com/Craeckie/portmgr.git"
+[project.scripts]
+portmgr = "portmgr:main"

{portmgr-1.7.0.dev1 → portmgr-1.8.0.dev0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='portmgr',
-    version='1.7.0dev1',
+    version='1.8.0dev0',
     url="https://github.com/Craeckie/portmgr",
     description="Simple command interface to manage multiple Docker container",
     packages=find_packages(), #['portmgr'],

portmgr-1.7.0.dev1/portmgr/commands/push.py

@@ -1,69 +0,0 @@
-from portmgr import command_list, bcolors, runCompose
-import subprocess
-import os
-
-from portmgr.wrapper import getServices
-
-
-def func(action):
-    directory = action['directory']
-    relative = action['relative']
-
-    services = getServices(includeOnlyBuildable=True)
-
-    print('Services to build: ' + ', '.join(services))
-
-    res = 0
-    for service in services.keys():
-        print(f"\nBuilding {service}")
-
-        if os.environ.get("PORTMGR_MULTI_PLATFORM", "").lower():
-            new_res = runBuildx(
-                ['bake',
-                 '--pull',
-                 '--push',
-                 '--set', f'*.platform={PORTMGR_MULTI_PLATFORM}',
-                 service
-                 ]
-            )
-            if new_res != 0:
-                res = new_res
-                print(f"Error building {service}!")
-        else:
-            new_res = runCompose(
-                    ['build',
-                     '--pull',
-                     '--force-rm',
-                     '--compress',
-                     service
-                     ]
-                    )
-            if new_res != 0:
-                res = new_res
-                print(f"Error building {service}!")
-            else:
-                new_res = runCompose(
-                        ['push',
-                         '--ignore-push-failures',
-                         service
-                         ]
-                        )
-                if new_res != 0:
-                    res = new_res
-            print(f"Error pushing {service}!")
-        if os.environ.get("PORTMGR_CLEAN_AFTER_PUSH", "").lower() == "true":
-            subprocess.call(['docker', 'system', 'prune', '--all', '--force'])
-            subprocess.call(['docker', 'buildx', 'prune', '--all', '--force'])
-
-    if res != 0:
-        print("Error building&pushing " + relative + "!")
-        return res
-
-    return res
-
-
-command_list['r'] = {
-    'hlp': 'build, push to registry & remove image',
-    'ord': 'nrm',
-    'fnc': func
-}

portmgr-1.7.0.dev1/portmgr.egg-info/requires.txt

@@ -1,5 +0,0 @@
-jsonschema
-tabulate
-PyYAML
-jsonschema
-humanfriendly