netkiller-devops 0.7.2__tar.gz → 0.7.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/PKG-INFO +8 -4
  2. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/README.md +6 -2
  3. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/docker.py +1 -5
  4. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller_devops.egg-info/PKG-INFO +8 -4
  5. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/setup.py +2 -2
  6. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/LICENSE +0 -0
  7. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/backup +0 -0
  8. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/chpasswd.sh +0 -0
  9. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/cicd +0 -0
  10. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/deployment +0 -0
  11. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/dingtalk +0 -0
  12. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/exceldiff +0 -0
  13. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/gitsync +0 -0
  14. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/logviewer +0 -0
  15. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/logviewer.docker +0 -0
  16. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/logviewer.kubectl +0 -0
  17. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/lrsync +0 -0
  18. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/matrixpasswd +0 -0
  19. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/mdump +0 -0
  20. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/merge +0 -0
  21. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/mysqlshell +0 -0
  22. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/nacos +0 -0
  23. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/osconf +0 -0
  24. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/randpasswd +0 -0
  25. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/randtext +0 -0
  26. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/sqldump +0 -0
  27. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/voice +0 -0
  28. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/bin/wechat +0 -0
  29. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/doc/voice.md +0 -0
  30. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/doc/wechat.md +0 -0
  31. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/deployment.cfg +0 -0
  32. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/dump.ini.sample +0 -0
  33. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/logviewer.ini +0 -0
  34. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/mongo.ini.sample +0 -0
  35. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/notification.ini +0 -0
  36. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/os.ini +0 -0
  37. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/schedule.cfg +0 -0
  38. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/etc/task.cfg +0 -0
  39. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/__init__.py +0 -0
  40. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/cicd.py +0 -0
  41. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/git.py +0 -0
  42. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/gitlab.py +0 -0
  43. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/kubernetes.py +0 -0
  44. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/mongo.py +0 -0
  45. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/mysql.py +0 -0
  46. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/nacos.py +0 -0
  47. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/nagios.py +0 -0
  48. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/pipeline.py +0 -0
  49. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/podman.py +0 -0
  50. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/rsync.py +0 -0
  51. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/svg.py +0 -0
  52. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/wework.py +0 -0
  53. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller/whiptail.py +0 -0
  54. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller_devops.egg-info/SOURCES.txt +0 -0
  55. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller_devops.egg-info/dependency_links.txt +0 -0
  56. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller_devops.egg-info/requires.txt +0 -0
  57. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/netkiller_devops.egg-info/top_level.txt +0 -0
  58. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/setup.cfg +0 -0
  59. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/share/example/testing/example.com.ini +0 -0
  60. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/share/profile.d/devops.sh +0 -0
  61. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/shell/backup/backup.mysql.gpg.sh +0 -0
  62. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/shell/backup/backup.mysql.sh +0 -0
  63. {netkiller_devops-0.7.2 → netkiller_devops-0.7.4}/shell/backup/backup.mysql.struct.sh +0 -0
@@ -1,8 +1,8 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: netkiller-devops
3
- Version: 0.7.2
3
+ Version: 0.7.4
4
4
  Summary: DevOps of useful deployment and automation
5
- Home-page: https://github.com/oscm/devops
5
+ Home-page: https://www.netkiller.cn
6
6
  Author: Neo Chen
7
7
  Author-email: netkiller@msn.com
8
8
  License: BSD
@@ -72,10 +72,14 @@ Deployment
72
72
 
73
73
  ### Deploy Pypi
74
74
 
75
- $ pip install setuptools wheel
76
- $ python3 setup.py sdist bdist_wheel
75
+ $ pip install setuptools wheel twine
76
+ $ python setup.py sdist bdist_wheel
77
77
  $ twine upload dist/netkiller-devops-x.x.x.tar.gz
78
78
 
79
+ 指定镜像
80
+
81
+ $ pip3 install netkiller-devops --upgrade -i https://pypi.org/project
82
+
79
83
  Backup
80
84
  ------
81
85
  [Data backup tools](https://github.com/netkiller/devops/blob/master/doc/backup.md).
@@ -50,10 +50,14 @@ Deployment
50
50
 
51
51
  ### Deploy Pypi
52
52
 
53
- $ pip install setuptools wheel
54
- $ python3 setup.py sdist bdist_wheel
53
+ $ pip install setuptools wheel twine
54
+ $ python setup.py sdist bdist_wheel
55
55
  $ twine upload dist/netkiller-devops-x.x.x.tar.gz
56
56
 
57
+ 指定镜像
58
+
59
+ $ pip3 install netkiller-devops --upgrade -i https://pypi.org/project
60
+
57
61
  Backup
58
62
  ------
59
63
  [Data backup tools](https://github.com/netkiller/devops/blob/master/doc/backup.md).
@@ -436,12 +436,8 @@ class Composes(Common):
436
436
  if isinstance(obj, Services):
437
437
  if obj.dockerfile:
438
438
  self.dockerfile[obj.name] = obj.dockerfile
439
- # service = obj.service.copy()
440
- # service = dict(obj.service)
441
439
  service = copy.deepcopy(obj.service)
442
- # obj.dump()
443
440
  self.compose["services"].update(service)
444
- # print(self.compose["services"])
445
441
  return self
446
442
 
447
443
  def networks(self, obj):
@@ -720,7 +716,7 @@ class Docker(Common):
720
716
  self.env(env)
721
717
 
722
718
  def none(self):
723
- cmd = "docker images|grep none|awk '{print $3}'|xargs docker rmi -f > /dev/null 2>&1"
719
+ cmd = "docker images|grep none|awk '{print $3}'|xargs -r docker rmi -f > /dev/null 2>&1"
724
720
  os.system(cmd)
725
721
  return self
726
722
 
@@ -1,8 +1,8 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: netkiller-devops
3
- Version: 0.7.2
3
+ Version: 0.7.4
4
4
  Summary: DevOps of useful deployment and automation
5
- Home-page: https://github.com/oscm/devops
5
+ Home-page: https://www.netkiller.cn
6
6
  Author: Neo Chen
7
7
  Author-email: netkiller@msn.com
8
8
  License: BSD
@@ -72,10 +72,14 @@ Deployment
72
72
 
73
73
  ### Deploy Pypi
74
74
 
75
- $ pip install setuptools wheel
76
- $ python3 setup.py sdist bdist_wheel
75
+ $ pip install setuptools wheel twine
76
+ $ python setup.py sdist bdist_wheel
77
77
  $ twine upload dist/netkiller-devops-x.x.x.tar.gz
78
78
 
79
+ 指定镜像
80
+
81
+ $ pip3 install netkiller-devops --upgrade -i https://pypi.org/project
82
+
79
83
  Backup
80
84
  ------
81
85
  [Data backup tools](https://github.com/netkiller/devops/blob/master/doc/backup.md).
@@ -9,13 +9,13 @@ with open("README.md", "r") as fh:
9
9
 
10
10
  setup(
11
11
  name="netkiller-devops",
12
- version="0.7.2",
12
+ version="0.7.4",
13
13
  author="Neo Chen",
14
14
  author_email="netkiller@msn.com",
15
15
  description="DevOps of useful deployment and automation",
16
16
  long_description=long_description,
17
17
  long_description_content_type="text/markdown",
18
- url="https://github.com/oscm/devops",
18
+ url="https://www.netkiller.cn",
19
19
  license="BSD",
20
20
  classifiers=[
21
21
  "Development Status :: 5 - Production/Stable",