diff --git a/main.py b/main.py index e80707d..92220cd 100755 --- a/main.py +++ b/main.py @@ -243,7 +243,7 @@ def get_compose_files(): "--depth=1", "--filter=blob:none", "--no-checkout", - "git@gitlab.sectorq.eu:/jaydee/docker-compose.git", + "git@gitlab.sectorq.eu:/home/docker-compose.git", repo_path ]) @@ -254,8 +254,12 @@ def get_compose_files(): "HEAD", "--name-only" ], cwd=repo_path) + folders = [] + for line in output.splitlines(): + if "/" in line and line.split("/")[0] != "__swarm": + folders.append(line.split("/")[0]) - print(output) + return list(dict.fromkeys(folders)) def prompt_missing_args(args_in, defaults_in, fields, action=None,stacks=None): @@ -292,14 +296,14 @@ def prompt_missing_args(args_in, defaults_in, fields, action=None,stacks=None): elif field == "stack": if args.action == "create_stack": # input(json.dumps(stacks, indent=2)) - get_compose_files() - commands = [ - 'api_server', 'authentik', 'bitwarden', 'bookstack', 'databasus', 'dockermon', 'duplicati', 'fail2ban', 'filebrowser', 'gitea', 'gitlab', 'grafana', 'grocy', - 'hashicorp', 'home-assistant', 'homebox','homepage', 'immich', 'influxdb', 'jupyter', 'kestra', 'kopia', 'linkding', 'linkwarden', 'mailu3', - 'mealie', 'mediacenter', 'mosquitto', 'motioneye', 'n8n', 'nebula', 'nextcloud', 'nginx', - 'node-red', 'octoprint', 'ollama', 'onlyoffice', 'paperless-ngx', 'pihole', 'portainer-ce','portainerce', 'puppet', 'puppet-agent', 'rancher', 'registry', - 'regsync', 'repo_mirror', 'searxng','semaphore', 'unifibrowser', 'uptime-kuma', 'watchtower', 'wazuh', 'webhub', 'wordpress', - 'wud', 'zabbix-server'] + commands = get_compose_files() + # commands = [ + # 'api_server', 'authentik', 'bitwarden', 'bookstack', 'databasus', 'dockermon', 'duplicati', 'fail2ban', 'filebrowser', 'gitea', 'gitlab', 'grafana', 'grocy', + # 'hashicorp', 'home-assistant', 'homebox','homepage', 'immich', 'influxdb', 'jupyter', 'kestra', 'kopia', 'linkding', 'linkwarden', 'mailu3', + # 'mealie', 'mediacenter', 'mosquitto', 'motioneye', 'n8n', 'nebula', 'nextcloud', 'nginx', + # 'node-red', 'octoprint', 'ollama', 'onlyoffice', 'paperless-ngx', 'pihole', 'portainer-ce','portainerce', 'puppet', 'puppet-agent', 'rancher', 'registry', + # 'regsync', 'repo_mirror', '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()) for s in por.all_data['stacks'][defaults_in[f"PORTAINER_ENDPOINT_ID".upper()]]['by_name'].keys(): diff --git a/portainer/__pycache__/__init__.cpython-312.pyc b/portainer/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..8bd2bc8 Binary files /dev/null and b/portainer/__pycache__/__init__.cpython-312.pyc differ diff --git a/portainer/__pycache__/api.cpython-312.pyc b/portainer/__pycache__/api.cpython-312.pyc new file mode 100644 index 0000000..b99f231 Binary files /dev/null and b/portainer/__pycache__/api.cpython-312.pyc differ diff --git a/portainer/api.py b/portainer/api.py index 72675f1..664d62e 100644 --- a/portainer/api.py +++ b/portainer/api.py @@ -671,7 +671,6 @@ class PortainerApi: elif endpoint == "m-s": server = "_m-server" - input(server) if stack_mode == "swarm": swarm_id = self.get_swarm_id(endpoint)