build

port.py

@@ -161,6 +161,7 @@ class Portainer:
             data=payload,
             headers={"X-Gotify-Key": "ASn_fIAd5OVjm8c"}
         )
+        logger.debug(response.text)
         # print("Status:", response.status_code)
         # print("Response:", response.text)
         pass
@@ -886,15 +887,21 @@ class Portainer:
                 values=service_tuples
             ).run()
         elif self.args.service_id == "all":
-            service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" and s[0] != "__ONLY_CHECK__"]
+            service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" ]
         else:
             service_ids = [self.args.service_id]
-        if "__ONLY_CHECK__" in service_ids or self.args.update is False:
-            pull = False
-            print("Checking for updates only...")
+        
+        if self.args.update is False:
+            if "__ONLY_CHECK__" in service_ids:
+                service_ids.remove("__ONLY_CHECK__")
+                pull = False
+                print("Checking for updates only...")
+            else:
+                pull = True
+                print("Checking for updates and pulling updates...")
         else:
-            print("Checking for updates and pulling updates...")
             pull = True
+            print("Checking for updates and pulling updates...")
         if "__ALL__" in service_ids:
             service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" and s[0] != "__ONLY_CHECK__"]
             
@@ -923,7 +930,7 @@ class Portainer:
                 print("?")
             elif resp['Status'] == "outdated":
                 if pull:
-                    
+                    print("Recreate")
                     self.recreate_container(service_id, pull)
                     #print(f"Service {service_dict[service_id]:<{longest}} : updated")
                     self.gotify_message(f"Service {service_dict[service_id]} updated")
@@ -963,25 +970,30 @@ class Portainer:
                 text="Choose a service:",
                 values=service_tuples
             ).run()
+            if "__ONLY_CHECK__" in service_ids:
+                self.args.update = False
+            else:
+                self.args.update = True
+            if "__ALL__" in service_ids:
+                service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" and s[0] != "__ONLY_CHECK__"]
+            
         elif self.args.service_id == "all":
             service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" and s[0] != "__ONLY_CHECK__"]
         else:
             service_ids = [self.args.service_id]
-        if self.args.update is False:
-            if "__ONLY_CHECK__" in service_ids:
-                pull = False
-                print("Checking for updates only...")
-            else:
-                pull = True
-                print("Checking for updates and pulling updates...")
-        else:
+        
+        if self.args.update:
             pull = True
             print("Checking for updates and pulling updates...")
-        if "__ALL__" in service_ids:
-            service_ids = [s[0] for s in service_tuples if s[0] != "__ALL__" and s[0] != "__ONLY_CHECK__"]
+        else:
+            pull = False
+            print("Checking for updates only...")
+            
             
         longest = 0
         for a in service_dict.items():
+            if a[0] == "__ONLY_CHECK__":
+                continue
            # print(a[1])
             if len(a[1]) > longest:
                 longest = len(a[1])
@@ -1082,7 +1094,7 @@ class Portainer:
     def recreate_container(self,service_id, pull=False):
         """Restart a service on an endpoint."""
         path = f"/docker/{self.endpoint_id}/containers/{service_id}/recreate"
-        #print(path)
+        print(path)
         params={"pullImage": pull}
         try:
             resp = self._api_post(path, json=params, timeout=20)
@@ -1097,7 +1109,7 @@ class Portainer:
         params={"serviceID": service_id, "pullImage": pool}
         try:
             resp = self._api_put(path, json=params, timeout=20)
-            print(resp)
+            # print(resp)
         except ValueError as e:
             print(f"Error restarting service: {e}")
             return []

portainer.py

@@ -39,7 +39,7 @@ else:
     raise Exception("Failed to authenticate with Vault")
 # Specify the mount point of your KV engine
 
-VERSION = "0.1.14"
+VERSION = "0.1.16"
 
 defaults = {
     "endpoint_id": "vm01",
@@ -163,7 +163,7 @@ update_configs(cur_config)
 if args.debug:
     input(cur_config)
 
-_LOG_LEVEL = "INFO"
+_LOG_LEVEL = "DEBUG"
 LOG_FILE = "/tmp/portainer.log"
 if _LOG_LEVEL == "DEBUG":
     logging.basicConfig(