netkiller-devops 0.7.20__tar.gz → 0.7.22__tar.gz

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netkiller-devops
-Version: 0.7.20
+Version: 0.7.22
 Summary: DevOps of useful deployment and automation
 Home-page: https://www.netkiller.cn
 Author: Neo Chen
@@ -101,6 +101,10 @@ OS Software Configure Managment
 	$ python setup.py sdist bdist_wheel
 	$ twine upload dist/netkiller-devops-x.x.x.tar.gz 
 
+  pip install --upgrade build
+  python -m build  
+  twine upload dist/netkiller_devops-0.7.21*
+
 ### PATH Variable
 
 	$ cp share/profile.d/devops.sh /etc/profile.d/

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/README.md

@@ -74,6 +74,10 @@ OS Software Configure Managment
 	$ python setup.py sdist bdist_wheel
 	$ twine upload dist/netkiller-devops-x.x.x.tar.gz 
 
+  pip install --upgrade build
+  python -m build  
+  twine upload dist/netkiller_devops-0.7.21*
+
 ### PATH Variable
 
 	$ cp share/profile.d/devops.sh /etc/profile.d/

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/netkiller/docker.py

@@ -7,6 +7,8 @@
 import os, sys
 import copy
 import json
+import subprocess
+from enum import Enum
 from io import StringIO
 
 from ruamel.yaml import YAML
@@ -15,11 +17,18 @@ import logging, logging.handlers
 from optparse import OptionParser, OptionGroup
 
 
+
+
 class Common:
     def __init__(self):
         self.logger = logging.getLogger(__name__)
         self.yaml = YAML()
 
+    class Restart:
+        always = 'always'
+        unless_stopped = 'unless-stopped'
+        on_failure = 'on‑failure'
+        no = 'no'
 
 class Dockerfile(Common):
     def __init__(self,namespace:str,context:str=None,target:str=None):
@@ -183,12 +192,14 @@ class Volumes(Common):
         if name:
             self.volumes[name] = None
 
-    def ls(self):
-        pass
-
-    def create(self, name):
-        self.volumes[name] = None
-        return self
+    def add(self,volume:str, **kwargs):
+        self.volumes[volume] = {}
+        if 'name' in kwargs:
+            self.volumes[volume]['name'] = kwargs['name']
+        if 'external' in kwargs:
+            self.volumes[volume]['external'] = kwargs['external']
+        if 'driver' in kwargs:
+            self.volumes[volume]['driver'] = kwargs['driver']
 
 
 class Services(Common):
@@ -793,8 +804,17 @@ class Docker(Common):
 
     def none(self):
         # cmd = "docker images|grep none|awk '{print $3}'|xargs -r docker rmi -f > /dev/null 2>&1"
-        cmd = 'docker rmi $(docker images -f "dangling=true" -q)'
-        os.system(cmd)
+        # cmd = 'docker rmi $(docker images -f "dangling=true" -q)'
+        cmd = 'docker image prune - f'
+        # os.system(cmd)
+        result = subprocess.run(
+            cmd,
+            stdout=subprocess.PIPE,  # 捕获标准输出
+            stderr=subprocess.PIPE,  # 捕获错误输出
+            text=True  # 返回字符串，而不是bytes（python3.7+也可用universal_newlines=True）
+        )
+
+        self.logger.info(f"{cmd} returncode:{result.returncode}, stdout:{result.stdout}, stderr:{result.stderr}")
         return self
 
     def env(self, default):

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/netkiller/pipeline.py

@@ -14,9 +14,6 @@ import tempfile
 import subprocess
 from datetime import datetime
 from string import Template
-sys.path.insert(0, '/Users/neo/workspace/devops')
-sys.path.insert(0, '../devops')
-
 
 class Stage:
     def __init__(self) -> None:
@@ -32,12 +29,12 @@ class Pipeline:
     logfile = None
     image = None
 
-    def __init__(self, workspace, logging):
+    def __init__(self, workspace):
         self.container = 'docker'
         self.registry = None
         self.image = None
         self.workspace = workspace
-        self.logging = logging
+        self.logging = logging.getLogger(__class__.__name__)
         self.pipelines = {}
         if not os.path.exists(self.workspace):
             os.mkdir(self.workspace)
@@ -250,4 +247,5 @@ class Pipeline:
 
     def debug(self):
         self.logging.debug(self.pipelines)
+        print(self.pipelines)
         return self

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/netkiller_devops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netkiller-devops
-Version: 0.7.20
+Version: 0.7.22
 Summary: DevOps of useful deployment and automation
 Home-page: https://www.netkiller.cn
 Author: Neo Chen
@@ -101,6 +101,10 @@ OS Software Configure Managment
 	$ python setup.py sdist bdist_wheel
 	$ twine upload dist/netkiller-devops-x.x.x.tar.gz 
 
+  pip install --upgrade build
+  python -m build  
+  twine upload dist/netkiller_devops-0.7.21*
+
 ### PATH Variable
 
 	$ cp share/profile.d/devops.sh /etc/profile.d/

{netkiller_devops-0.7.20 → netkiller_devops-0.7.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netkiller-devops"
-version = "0.7.20"
+version = "0.7.22"
 authors = [
     { name = "Neo Chen", email = "netkiller@msn.com" },
 ]