From 5f10d4e2240c023cc96cbafef1605573064b0e8c Mon Sep 17 00:00:00 2001 From: PAPAMICA Date: Wed, 11 May 2022 14:08:27 +0200 Subject: [PATCH] changement architecture --- .../workflows/generate-template-json.py | 6 +++--- adminer.yml => composes-files/adminer.yml | 0 bookstack.yml => composes-files/bookstack.yml | 0 cachethq.yml => composes-files/cachethq.yml | 0 etherpad.yml => composes-files/etherpad.yml | 0 filebot.yml => composes-files/filebot.yml | 0 filebrowser.yml => composes-files/filebrowser.yml | 0 gitlab.yml => composes-files/gitlab.yml | 0 grafana.yml => composes-files/grafana.yml | 0 hastebin.yml => composes-files/hastebin.yml | 0 jirafeau.yml => composes-files/jirafeau.yml | 0 keycloak.yml => composes-files/keycloak.yml | 0 matomo.yml => composes-files/matomo.yml | 0 nextcloud.yml => composes-files/nextcloud.yml | 0 openvpn.yml => composes-files/openvpn.yml | 0 ouroboros.yml => composes-files/ouroboros.yml | 0 privatebin.yml => composes-files/privatebin.yml | 0 projectsend.yml => composes-files/projectsend.yml | 0 shorturl.yml => composes-files/shorturl.yml | 0 sinusbot.yml => composes-files/sinusbot.yml | 0 taiga.yml => composes-files/taiga.yml | 0 teamspeak.yml => composes-files/teamspeak.yml | 0 traefik.yml => composes-files/traefik.yml | 0 ts3rank.yml => composes-files/ts3rank.yml | 0 ts3viewer.yml => composes-files/ts3viewer.yml | 0 umami.yml => composes-files/umami.yml | 0 vault.yml => composes-files/vault.yml | 0 vaultwarden.yml => composes-files/vaultwarden.yml | 0 vscode.yml => composes-files/vscode.yml | 0 .../website-html.yml | 0 wikijs.yml => composes-files/wikijs.yml | 0 wiznote.yml => composes-files/wiznote.yml | 0 wordpress.yml => composes-files/wordpress.yml | 0 yourls.yml => composes-files/yourls.yml | 0 .../zabbix-cachethq.yml | 0 .../zabbix-proxy.yml | 0 zabbix.yml => composes-files/zabbix.yml | 0 env | 14 -------------- 38 files changed, 3 insertions(+), 17 deletions(-) rename generate-template-json.py => .github/workflows/generate-template-json.py (93%) rename adminer.yml => composes-files/adminer.yml (100%) rename bookstack.yml => composes-files/bookstack.yml (100%) rename cachethq.yml => composes-files/cachethq.yml (100%) rename etherpad.yml => composes-files/etherpad.yml (100%) rename filebot.yml => composes-files/filebot.yml (100%) rename filebrowser.yml => composes-files/filebrowser.yml (100%) rename gitlab.yml => composes-files/gitlab.yml (100%) rename grafana.yml => composes-files/grafana.yml (100%) rename hastebin.yml => composes-files/hastebin.yml (100%) rename jirafeau.yml => composes-files/jirafeau.yml (100%) rename keycloak.yml => composes-files/keycloak.yml (100%) rename matomo.yml => composes-files/matomo.yml (100%) rename nextcloud.yml => composes-files/nextcloud.yml (100%) rename openvpn.yml => composes-files/openvpn.yml (100%) rename ouroboros.yml => composes-files/ouroboros.yml (100%) rename privatebin.yml => composes-files/privatebin.yml (100%) rename projectsend.yml => composes-files/projectsend.yml (100%) rename shorturl.yml => composes-files/shorturl.yml (100%) rename sinusbot.yml => composes-files/sinusbot.yml (100%) rename taiga.yml => composes-files/taiga.yml (100%) rename teamspeak.yml => composes-files/teamspeak.yml (100%) rename traefik.yml => composes-files/traefik.yml (100%) rename ts3rank.yml => composes-files/ts3rank.yml (100%) rename ts3viewer.yml => composes-files/ts3viewer.yml (100%) rename umami.yml => composes-files/umami.yml (100%) rename vault.yml => composes-files/vault.yml (100%) rename vaultwarden.yml => composes-files/vaultwarden.yml (100%) rename vscode.yml => composes-files/vscode.yml (100%) rename website-html.yml => composes-files/website-html.yml (100%) rename wikijs.yml => composes-files/wikijs.yml (100%) rename wiznote.yml => composes-files/wiznote.yml (100%) rename wordpress.yml => composes-files/wordpress.yml (100%) rename yourls.yml => composes-files/yourls.yml (100%) rename zabbix-cachethq.yml => composes-files/zabbix-cachethq.yml (100%) rename zabbix-proxy.yml => composes-files/zabbix-proxy.yml (100%) rename zabbix.yml => composes-files/zabbix.yml (100%) delete mode 100644 env diff --git a/generate-template-json.py b/.github/workflows/generate-template-json.py similarity index 93% rename from generate-template-json.py rename to .github/workflows/generate-template-json.py index f56d559..0edb4b0 100755 --- a/generate-template-json.py +++ b/.github/workflows/generate-template-json.py @@ -5,9 +5,9 @@ import re import json from textwrap import indent -GITHUB_REPOSITORY_URL = 'https://github.com/PAPAMICA/docker-compose-collection' +GITHUB_REPOSITORY_URL = 'https://github.com/PAPAMICA/docker-compose-collection/composes-files' try: - os.remove("./templates-portainer.json") + os.remove("../../../templates-portainer.json") except: print ("file don't exist") result = {} @@ -65,7 +65,7 @@ for filename in sorted(glob.glob("*.y*ml")): try: result["templates"] = templates json_data = json.dumps(result, indent=4) - with open('templates-portainer.json', 'w') as outfile: + with open('../../../templates-portainer.json', 'w') as outfile: outfile.write(json_data) print ("\n ✅ File generated !") except: diff --git a/adminer.yml b/composes-files/adminer.yml similarity index 100% rename from adminer.yml rename to composes-files/adminer.yml diff --git a/bookstack.yml b/composes-files/bookstack.yml similarity index 100% rename from bookstack.yml rename to composes-files/bookstack.yml diff --git a/cachethq.yml b/composes-files/cachethq.yml similarity index 100% rename from cachethq.yml rename to composes-files/cachethq.yml diff --git a/etherpad.yml b/composes-files/etherpad.yml similarity index 100% rename from etherpad.yml rename to composes-files/etherpad.yml diff --git a/filebot.yml b/composes-files/filebot.yml similarity index 100% rename from filebot.yml rename to composes-files/filebot.yml diff --git a/filebrowser.yml b/composes-files/filebrowser.yml similarity index 100% rename from filebrowser.yml rename to composes-files/filebrowser.yml diff --git a/gitlab.yml b/composes-files/gitlab.yml similarity index 100% rename from gitlab.yml rename to composes-files/gitlab.yml diff --git a/grafana.yml b/composes-files/grafana.yml similarity index 100% rename from grafana.yml rename to composes-files/grafana.yml diff --git a/hastebin.yml b/composes-files/hastebin.yml similarity index 100% rename from hastebin.yml rename to composes-files/hastebin.yml diff --git a/jirafeau.yml b/composes-files/jirafeau.yml similarity index 100% rename from jirafeau.yml rename to composes-files/jirafeau.yml diff --git a/keycloak.yml b/composes-files/keycloak.yml similarity index 100% rename from keycloak.yml rename to composes-files/keycloak.yml diff --git a/matomo.yml b/composes-files/matomo.yml similarity index 100% rename from matomo.yml rename to composes-files/matomo.yml diff --git a/nextcloud.yml b/composes-files/nextcloud.yml similarity index 100% rename from nextcloud.yml rename to composes-files/nextcloud.yml diff --git a/openvpn.yml b/composes-files/openvpn.yml similarity index 100% rename from openvpn.yml rename to composes-files/openvpn.yml diff --git a/ouroboros.yml b/composes-files/ouroboros.yml similarity index 100% rename from ouroboros.yml rename to composes-files/ouroboros.yml diff --git a/privatebin.yml b/composes-files/privatebin.yml similarity index 100% rename from privatebin.yml rename to composes-files/privatebin.yml diff --git a/projectsend.yml b/composes-files/projectsend.yml similarity index 100% rename from projectsend.yml rename to composes-files/projectsend.yml diff --git a/shorturl.yml b/composes-files/shorturl.yml similarity index 100% rename from shorturl.yml rename to composes-files/shorturl.yml diff --git a/sinusbot.yml b/composes-files/sinusbot.yml similarity index 100% rename from sinusbot.yml rename to composes-files/sinusbot.yml diff --git a/taiga.yml b/composes-files/taiga.yml similarity index 100% rename from taiga.yml rename to composes-files/taiga.yml diff --git a/teamspeak.yml b/composes-files/teamspeak.yml similarity index 100% rename from teamspeak.yml rename to composes-files/teamspeak.yml diff --git a/traefik.yml b/composes-files/traefik.yml similarity index 100% rename from traefik.yml rename to composes-files/traefik.yml diff --git a/ts3rank.yml b/composes-files/ts3rank.yml similarity index 100% rename from ts3rank.yml rename to composes-files/ts3rank.yml diff --git a/ts3viewer.yml b/composes-files/ts3viewer.yml similarity index 100% rename from ts3viewer.yml rename to composes-files/ts3viewer.yml diff --git a/umami.yml b/composes-files/umami.yml similarity index 100% rename from umami.yml rename to composes-files/umami.yml diff --git a/vault.yml b/composes-files/vault.yml similarity index 100% rename from vault.yml rename to composes-files/vault.yml diff --git a/vaultwarden.yml b/composes-files/vaultwarden.yml similarity index 100% rename from vaultwarden.yml rename to composes-files/vaultwarden.yml diff --git a/vscode.yml b/composes-files/vscode.yml similarity index 100% rename from vscode.yml rename to composes-files/vscode.yml diff --git a/website-html.yml b/composes-files/website-html.yml similarity index 100% rename from website-html.yml rename to composes-files/website-html.yml diff --git a/wikijs.yml b/composes-files/wikijs.yml similarity index 100% rename from wikijs.yml rename to composes-files/wikijs.yml diff --git a/wiznote.yml b/composes-files/wiznote.yml similarity index 100% rename from wiznote.yml rename to composes-files/wiznote.yml diff --git a/wordpress.yml b/composes-files/wordpress.yml similarity index 100% rename from wordpress.yml rename to composes-files/wordpress.yml diff --git a/yourls.yml b/composes-files/yourls.yml similarity index 100% rename from yourls.yml rename to composes-files/yourls.yml diff --git a/zabbix-cachethq.yml b/composes-files/zabbix-cachethq.yml similarity index 100% rename from zabbix-cachethq.yml rename to composes-files/zabbix-cachethq.yml diff --git a/zabbix-proxy.yml b/composes-files/zabbix-proxy.yml similarity index 100% rename from zabbix-proxy.yml rename to composes-files/zabbix-proxy.yml diff --git a/zabbix.yml b/composes-files/zabbix.yml similarity index 100% rename from zabbix.yml rename to composes-files/zabbix.yml diff --git a/env b/env deleted file mode 100644 index f293f21..0000000 --- a/env +++ /dev/null @@ -1,14 +0,0 @@ - -SERVICE= -DATA_LOCATION= -DATA= -URL_LOKI= -NDD= -URL= -DB_USER= -DB_PASSWORD= -DB_ROOT= -DATA= -ADMIN_USERNAME= -ADMIN_PASSWORD= -ADMIN_EMAIL= \ No newline at end of file