From 8db8953a5558481582f820ae017097636c5bf56f Mon Sep 17 00:00:00 2001 From: neo Date: Thu, 13 Jun 2024 20:58:05 +0800 Subject: [PATCH] fixed bug --- README.md | 3 ++- netkiller/docker.py | 6 +++--- setup.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 19397e3..50bbf31 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,8 @@ Deployment ### Deploy Pypi - $ python3 setup.py sdist bdist_wheel + $ pip install setuptools wheel twine + $ python setup.py sdist bdist_wheel $ twine upload dist/netkiller-devops-x.x.x.tar.gz Backup diff --git a/netkiller/docker.py b/netkiller/docker.py index 9442c10..d3cb7a8 100644 --- a/netkiller/docker.py +++ b/netkiller/docker.py @@ -436,9 +436,9 @@ def services(self, obj): if isinstance(obj, Services): if obj.dockerfile: self.dockerfile[obj.name] = obj.dockerfile - # service = obj.service.copy() + service = obj.service.copy() # service = dict(obj.service) - service = copy.deepcopy(obj.service) + # service = copy.deepcopy(obj.service) # obj.dump() self.compose["services"].update(service) # print(self.compose["services"]) @@ -720,7 +720,7 @@ def __init__(self, env=None): self.env(env) def none(self): - cmd = "docker images|grep none|awk '{print $3}'|xargs docker rmi -f > /dev/null 2>&1" + cmd = "docker images|grep none|awk '{print $3}'|xargs -r docker rmi -f > /dev/null 2>&1" os.system(cmd) return self diff --git a/setup.py b/setup.py index 2320e35..a9084ea 100644 --- a/setup.py +++ b/setup.py @@ -9,13 +9,13 @@ setup( name="netkiller-devops", - version="0.7.2", + version="0.7.3", author="Neo Chen", author_email="netkiller@msn.com", description="DevOps of useful deployment and automation", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/oscm/devops", + url="https://www.netkiller.cn", license="BSD", classifiers=[ "Development Status :: 5 - Production/Stable",