Merge branch 'dev'

Author: hsz1273327

.gitignore

@@ -127,5 +127,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
-
 .devcontainer

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.0.3
+
+## 接口修改
+
++ 子命令`updateservicebywebhook`的`tokens`参数现在是位置参数
++ 子命令`updateservicebywebhook`现在可以用执行目录下的`update_service_by_webhooks_config.json`文件作为配置
++ 子命令`createorupdatestack`的`endpoints`参数现在是位置参数
++ 子命令`createorupdatestack`现在可以用执行目录下的`create_or_update_stack_config.json`文件作为配置
++ 子命令`updateserviceinstack`的`deploy_path`参数参数现在是位置参数
++ 子命令`updateserviceinstack`现在可以用执行目录下的`update_service_in_stack_config.json`文件作为配置
+
+## bug修复
+
++ 修复`updateservicebywebhook`的调用url错误
+
 # 0.0.2
 
 ## 接口修改

dockerfile

@@ -9,4 +9,6 @@ ADD README.md /code/README.md
 ADD setup.cfg /code/setup.cfg
 ADD setup.py /code/setup.py
 RUN python setup.py install
+WORKDIR /
+RUN rm -rf /code
 ENTRYPOINT [ "python","-m", "portainer_deploy_tool"]

portainer_deploy_tool/create_or_update_stack.py

@@ -233,6 +233,7 @@ class CreateOrUpdateStack(EntryPoint):
     default_config_file_paths = [
         "./create_or_update_stack_config.json"
     ]
+    argparse_noflag = "endpoints"
     schema = {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "type": "object",

portainer_deploy_tool/update_service_by_webhook.py

@@ -23,6 +23,10 @@
 
 class UpdateServiceByWebhooks(EntryPoint):
     """利用webhook更新已经存在的service."""
+    default_config_file_paths = [
+        "./update_service_by_webhooks_config.json"
+    ]
+    argparse_noflag = "tokens"
     schema = {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "type": "object",
@@ -42,7 +46,7 @@ def do_main(self) -> None:
             rq.mount('https://', HTTPAdapter(max_retries=Retry(total=int(retry_max_times), backoff_factor=retry_interval_backoff_factor, method_whitelist=frozenset(['GET', 'POST', 'PUT']))))
         log.initialize_for_app(app_name="UpdateStack", log_level=log_level)
         for token in tokens:
-            res = rq.post(f"{base_url}/webhooks/{token}")
+            res = rq.post(f"{base_url}/api/webhooks/{token}")
             if res.status_code >= 300 or res.status_code <= 199:
                 log.error("update service query get error", status_code=res.status_code)
             else:

portainer_deploy_tool/update_service_in_stack.py

@@ -55,6 +55,10 @@
 
 class UpdateServiceInStack(EntryPoint):
     """更新已经存在的stack."""
+    default_config_file_paths = [
+        "./update_service_in_stack_config.json"
+    ]
+    argparse_noflag = "deploy_path"
     schema = {
         "$schema": "http://json-schema.org/draft-07/schema#",
         "type": "object",

setup.cfg

@@ -1,9 +1,9 @@
 [metadata]
 name = portainer_deploy_tool
-version = 0.0.2
-author = hsz12
-author_email = 
-description = 
+version = 0.0.3
+author = hsz
+author_email = hsz1273327@gmail.com
+description = portainer deploy tool for swarm
 long_description = file: README.md, CHANGELOG.md, LICENSE
 long_description_content_type = text/markdown
 keywords = portainer, docker-compose, git