build

.gitlab-ci.yml

@@ -1,20 +1,11 @@
+
 stages:          # List of stages for jobs, and their order of execution
-  # - notify_start
   - lint
   - build
   - clean
   - notify
 variables:
   GIT_SSH_COMMAND: "ssh -i /home/gitlab-runner/.ssh/id_rsa -o IdentitiesOnly=yes"
-# notify_start:
-#   stage: notify_start  # Should be in a later stage than the job that might fail
-#   script:
-#       - column=':'
-#       - echo "${flow_id}"
-#       - curl -XPOST http://192.168.77.101:8123/api/webhook/voice-notifications-tC_8YKxMJIAaQRV5riKuC7Zl --data-raw 'message=portainer build job started'
-#       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
-#   rules:
-#       - if: '$CI_COMMIT_MESSAGE =~ /build/'
 lint:
   stage: lint
   image: r.sectorq.eu/jaydee/builder-portainer:latest
@@ -32,19 +23,18 @@ lint:
 build-job:       # This job runs in the build stage, which runs first.
     stage: build
     image: r.sectorq.eu/jaydee/builder-portainer:latest
-    before_script:
-      - export PYTHONPATH=$PWD
     script:
       - mkdir -p ~/.ssh
       - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
       - chmod 600 ~/.ssh/id_rsa
-      - ls -la 
-      - pyinstaller --onefile --clean --hidden-import=portainer_api portainer.py
-      - strings dist/portainer | grep portainer_api || true
-      - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.80.222:/myapps/bin/ || true
+      - pip install uuid
+      #- pyinstaller --onefile --add-data "port.py:." portainer.py
+      - rm -rf build dist *.spec
+      - pyinstaller --onefile --clean -n portainer main.py
+      #- scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.80.222:/myapps/bin/ || true
       - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.77.12:/myapps/bin/ || true
       - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.77.101:/myapps/bin/ || true
-      - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.*
+      - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
     artifacts:
       paths:
       - dist/
@@ -60,14 +50,12 @@ clean-job:       # This job runs in the build stage, which runs first.
       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
     rules:
       - if: '$CI_COMMIT_MESSAGE =~ /build/'
-
 cleanup_on_failure_job:
   stage: clean  # Should be in a later stage than the job that might fail
   when: on_failure # <-- This is the key keyword
   script:
       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
-
-notify_complete:
+notify:
   stage: notify  # Should be in a later stage than the job that might fail
   when: on_success # <-- This is the key keyword
   script:
@@ -75,9 +63,7 @@ notify_complete:
       - echo "${flow_id}"
       - curl -XPOST http://192.168.77.101:8123/api/webhook/voice-notifications-tC_8YKxMJIAaQRV5riKuC7Zl --data-raw 'message=portainer build job completed'
       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
-  rules:
-      - if: '$CI_COMMIT_MESSAGE =~ /build/'
-notify_failed:
+notify2:
   stage: notify  # Should be in a later stage than the job that might fail
   when: on_failure # <-- This is the key keyword
   script:
@@ -87,4 +73,3 @@ notify_failed:
       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
   rules:
       - if: '$CI_COMMIT_MESSAGE =~ /build/'
-      

main.py

@@ -12,14 +12,22 @@ import sys
 import json
 import argparse
 import hvac
+import time
+import base64
+import shutil
+import requests
+from portainer.api import PortainerApi
+from git import Repo
+from concurrent.futures import ThreadPoolExecutor
 from tabulate import tabulate
-from portainer_api import PortainerApi
 from prompt_toolkit import prompt
 from prompt_toolkit.completion import WordCompleter
 from prompt_toolkit.shortcuts import checkboxlist_dialog
 from prompt_toolkit.shortcuts import radiolist_dialog
 
-VAULT_ADDR = os.environ.get("VAULT_ADDR", "http://192.168.77.101:8200")
+
+# VAULT_ADDR = os.environ.get("VAULT_ADDR", "http://192.168.77.101:8200")
+VAULT_ADDR = os.environ.get("VAULT_ADDR", "https://vault.sectorq.eu")
 try:
     VAULT_TOKEN = os.environ.get("VAULT_TOKEN")
     if VAULT_TOKEN is None:
@@ -36,7 +44,7 @@ else:
     raise Exception("Failed to authenticate with Vault")
 # Specify the mount point of your KV engine
 
-VERSION = "0.1.42"
+VERSION = "0.1.55"
 
 defaults = {
     "endpoint_id": "vm01",
@@ -241,11 +249,11 @@ def prompt_missing_args(args_in, defaults_in, fields, action=None,stacks=None):
                     if args.action == "create_stack":
                         # input(json.dumps(stacks, indent=2))
                         commands = [
-                            'authentik', 'bitwarden', 'bookstack', 'dockermon', 'fail2ban', 'gitea', 'gitlab', 'grafana',
-                            'hashicorp', 'home-assistant', 'homepage', 'immich', 'influxdb', 'jupyter', 'kestra', 'mailu3',
+                            'authentik', 'bitwarden', 'bookstack', 'dockermon', 'duplicati', 'fail2ban', 'gitea', 'gitlab', 'grafana', 'grocy',
+                            'hashicorp', 'home-assistant', 'homebox','homepage', 'immich', 'influxdb', 'jupyter', 'kestra', 'kopia', 'mailu3',
                             'mealie', 'mediacenter', 'mosquitto', 'motioneye', 'n8n', 'nebula', 'nextcloud', 'nginx',
                             'node-red', 'octoprint', 'ollama', 'onlyoffice', 'paperless-ngx', 'pihole', 'portainer-ce', 'rancher', 'registry',
-                            'regsync', 'semaphore', 'unifibrowser', 'uptime-kuma', 'watchtower', 'wazuh', 'webhub', 'wordpress',
+                            'regsync', 'searxng','semaphore', 'unifibrowser', 'uptime-kuma', 'watchtower', 'wazuh', 'webhub', 'wordpress',
                             'wud', 'zabbix-server']
                         try:
                             print(por.all_data['stacks'][defaults_in[f"PORTAINER_ENDPOINT_ID".upper()]]['by_name'].keys())
@@ -402,18 +410,13 @@ if __name__ == "__main__":
         ]  
         
         selected_action = radiolist_dialog(
-            title="Select one service",
+            title=f"Select one service - version: {VERSION}",
             text="Choose a service:",
             values=actions
         ).run()     
 
-
-
         print("Selected:", selected_action)
 
-        
-        
-        
         # print("Possible actions: \n")
         # i = 1
         # for a in actions:
@@ -675,8 +678,4 @@ if __name__ == "__main__":
         sys.exit()
 
     if args.action == "refresh_status":
-        if args.stack == "all":
-            print("Stopping all stacks...")
-            stcks = por.get_stacks(endpoint_id=args.endpoint_id)
-        else:
-            por.refresh_status(args.stack_id)
+        por.refresh_status(args)

portainer/api.py

@@ -141,6 +141,13 @@ class PortainerApi:
         self.get_endpoints()
         self.get_stacks()
 
+    def refresh_status(self, args):
+        for s in self.all_data['stacks']['m-s']['by_id']:
+            path = f'/stacks/{s}/images_status?refresh=true'
+            
+            print(path)
+            res = self._api_get(path, timeout=args.timeout)
+
     def _is_number(self, s):
         """Check if the input string is a number."""
         try:
@@ -159,7 +166,7 @@ class PortainerApi:
         response = requests.post(
             "https://gotify.sectorq.eu/message",
             data=payload,
-            headers={"X-Gotify-Key": "ASn_fIAd5OVjm8c"}
+            headers={"X-Gotify-Key": "A1krRuo8GIW-fpY"}
         )
         logger.debug(response.text)
         # print("Status:", response.status_code)
@@ -343,7 +350,6 @@ class PortainerApi:
         # print(stack)
         cont = []
         data = {}
-
         eps = [ep for ep in self.all_data['endpoints']['by_id'].keys()]
         #input(eps)
         for endpoint in eps:
@@ -362,11 +368,15 @@ class PortainerApi:
                 print(f"failed to get containers from {path}: {e}")
                 continue
             contr = []
+            # print(f"Containers: {containers}")
             try:
                 for c in containers:
-                    #input(c)
+                    # print(c)
+                    try:
                         cont.append([c["Names"][0].replace("/", ""),c["Id"], c['Image']])
                         contr.append([c["Names"][0].replace("/", ""), c["Id"], c['Image']])
+                    except:
+                        print("Unable to parse container info")
                 if self.all_data["endpoints"]["by_id"][endpoint] in data:
                     data[self.all_data["endpoints"]["by_id"][endpoint]] = contr
                     data[endpoint] = contr
@@ -489,7 +499,7 @@ class PortainerApi:
                 stacks_tuples.append((s['Webhook'],s['Name']))
                 # print(s['Name'], " : ", s['Webhook'])
         stacks_dict = dict(stacks_tuples)
-        print(stacks_dict)
+        # print(stacks_dict)
         #input(stacks_tuples)
         # stacks_tuples = [(s['AutoUpdate']['Webhook'], s['Name']) for s in stacks if "Webhook" in s['AutoUpdate'] ]
 
@@ -514,7 +524,7 @@ class PortainerApi:
                 values=stacks_tuples
             ).run()
         stcs = []
-        input(stack_ids)
+        #input(stack_ids)
 
         if args.stack == "all":
             for s in stack_dict:
@@ -524,11 +534,11 @@ class PortainerApi:
                 if s in stack_ids:
                     stcs.append([s, stack_dict[s]])
 
-        print(stcs)           
+        # print(stcs)           
         with ThreadPoolExecutor(max_workers=10) as exe:
             list(exe.map(update, stcs))
 
-        input('UPDATED')
+        #input('UPDATED')
         if not args.autostart:
             time.sleep(120)
             cont = []
@@ -868,7 +878,6 @@ class PortainerApi:
         headers = ["StackID", "Name", "Endpoint"]
         print(tabulate.tabulate(data, headers=headers, tablefmt="github"))
         print(f"Total stacks: {count}")
-        input("Continue...")
         # print(sorted(stack_names))
 
     def update_containers(self):
@@ -955,7 +964,7 @@ class PortainerApi:
                         print(image)
         if len(updates) > 0:
             if pull:
-                self.gotify_message(f"Services updated: {", ".join(updates)}")
+                self.gotify_message(f"Services updated: {', '.join(updates)}")
             else:
                 self.gotify_message(f"Services updates available: {', '.join(updates)}")
         print("\033[?25h", end="")
@@ -963,7 +972,14 @@ class PortainerApi:
 
     def update_service(self):
         all_services = self.get_services(self.get_endpoint_id())
-        #input(all_services)
+        if self.args.debug:
+            print(all_services)
+        if all_services == 503:
+            print("No services found on this endpoint.")
+            return False
+        if len(all_services) == 0:
+            print("No services found on this endpoint.")
+            return False
         service_tuples = [(s['ID'], s['Spec']['Name']) for s in all_services]
         service_tuples = sorted(service_tuples, key=lambda x: x[1])
         service_dict = dict(service_tuples)
@@ -1031,6 +1047,7 @@ class PortainerApi:
                     print(err)
             else:
                 print(ok)
+        self.gotify_message(f"Service update process finished")
         print("\033[?25h", end="")
         return True
 
@@ -1104,7 +1121,7 @@ class PortainerApi:
         # print(path)
         params={"pullImage": pull}
         try:
-            resp = self._api_post(path, json=params, timeout=20)
+            resp = self._api_post(path, json=params, timeout=120)
             #print(resp)
         except ValueError as e:
             print(f"Error restarting service: {e}")

requirements.txt

@@ -6,3 +6,5 @@ flake8
 pylint
 black
 docker
+hvac
+prompt_toolkit