Skip to content

Commit

Permalink
fixed bug
Browse files Browse the repository at this point in the history
  • Loading branch information
netkiller committed Jun 13, 2024
1 parent fb6cc8a commit 8db8953
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions netkiller/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 8db8953

Please sign in to comment.