diff --git a/automation/docker-compose.override.yml b/automation/docker-compose.override.yml new file mode 100644 index 0000000..8a53e38 --- /dev/null +++ b/automation/docker-compose.override.yml @@ -0,0 +1,7 @@ +services: + n8n: + labels: + net.unraid.docker.managed: 'composeman' + net.unraid.docker.icon: 'https://t1.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=http://homeassistant.io&size=256' + net.unraid.docker.webui: 'https://automation.homecube.org' + net.unraid.docker.shell: '' diff --git a/automation/docker-compose.yml b/automation/docker-compose.yml new file mode 100644 index 0000000..1107781 --- /dev/null +++ b/automation/docker-compose.yml @@ -0,0 +1,22 @@ +services: + n8n: + image: docker.n8n.io/n8nio/n8n + ports: + - "5678:5678" + environment: + - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true + - N8N_HOST=${SUBDOMAIN}.${DOMAIN_NAME} + - N8N_PORT=5678 + - N8N_PROTOCOL=http + - N8N_RUNNERS_ENABLED=true + - NODE_ENV=production + - WEBHOOK_URL=https://${SUBDOMAIN}.${DOMAIN_NAME}/ + - GENERIC_TIMEZONE=${GENERIC_TIMEZONE} + - TZ=${GENERIC_TIMEZONE} + volumes: + - /mnt/user/appdata/n8n/n8n_data:/home/node/.n8n + - /mnt/user/appdata/n8n/local-files:/files + labels: + folder.view2: "Services" + net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/n8n.png" + net.unraid.docker.webui: "https://automation.homecube.org" diff --git a/automation/name b/automation/name new file mode 100644 index 0000000..4a17ae3 --- /dev/null +++ b/automation/name @@ -0,0 +1 @@ +automation \ No newline at end of file diff --git a/cloud/docker-compose.override.yml b/cloud/docker-compose.override.yml index 8c3aa99..a3201c9 100644 --- a/cloud/docker-compose.override.yml +++ b/cloud/docker-compose.override.yml @@ -2,18 +2,24 @@ services: db: labels: net.unraid.docker.managed: 'composeman' - net.unraid.docker.icon: '' + net.unraid.docker.icon: 'https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/mariadb.png' net.unraid.docker.webui: '' net.unraid.docker.shell: '' app: labels: net.unraid.docker.managed: 'composeman' - net.unraid.docker.icon: '' - net.unraid.docker.webui: '' + net.unraid.docker.icon: 'https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/nextcloud.png' + net.unraid.docker.webui: 'https://cloud.homecube.org' net.unraid.docker.shell: '' redis: labels: net.unraid.docker.managed: 'composeman' - net.unraid.docker.icon: '' + net.unraid.docker.icon: 'https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/redis.png' + net.unraid.docker.webui: '' + net.unraid.docker.shell: '' + appapi-dsp: + labels: + net.unraid.docker.managed: 'composeman' + net.unraid.docker.icon: 'https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/nextcloud.png' net.unraid.docker.webui: '' net.unraid.docker.shell: '' diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml index bcb8e87..18762a8 100644 --- a/cloud/docker-compose.yml +++ b/cloud/docker-compose.yml @@ -11,6 +11,7 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud labels: + net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/mariadb.png" folder.view2: "Databases" redis: @@ -20,19 +21,35 @@ services: - /mnt/user/appdata/nextcloud/cache:/data command: redis-server --requirepass ${REDIS_HOST_PASSWORD} labels: + net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/redis.png" folder.view2: "Databases" + + appapi-dsp: + image: ghcr.io/nextcloud/nextcloud-appapi-dsp:release + networks: + - nextcloud-exapps + environment: + - NC_HAPROXY_PASSWORD=${APPAPI_DSP_PASSWORD} + volumes: + - /var/run/docker.sock:/var/run/docker.sock + privileged: true + labels: + net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/nextcloud.png" + folder.view2: "Services" app: image: nextcloud container_name: nextcloud ports: - 8090:80 - links: - - db - - redis depends_on: - db - redis + - appapi-dsp + networks: + - default + - nextcloud-exapps + - pangolin volumes: - /mnt/user/appdata/nextcloud/app:/var/www/html - /mnt/user/nextcloud-data:/var/www/html/data @@ -50,6 +67,18 @@ services: - REDIS_HOST_PASSWORD=${REDIS_HOST_PASSWORD} - APACHE_DISABLE_REWRITE_IP=1 - - TRUSTED_PROXIES=172.19.0.2 + - APACHE_BODY_LIMIT=0 + - TRUSTED_PROXIES=172.28.0.2 labels: + net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/nextcloud.png" + net.unraid.docker.webui: "https://cloud.homecube.org" folder.view2: "Services" + +networks: + nextcloud-exapps: + name: nextcloud-exapps + driver: bridge + + pangolin: + name: pangolin_net + external: true diff --git a/it-tools/autostart b/it-tools/autostart new file mode 100644 index 0000000..f32a580 --- /dev/null +++ b/it-tools/autostart @@ -0,0 +1 @@ +true \ No newline at end of file diff --git a/it-tools/docker-compose.override.yml b/it-tools/docker-compose.override.yml new file mode 100644 index 0000000..841dfb8 --- /dev/null +++ b/it-tools/docker-compose.override.yml @@ -0,0 +1,7 @@ +services: + it-tools: + labels: + net.unraid.docker.managed: 'composeman' + net.unraid.docker.icon: '' + net.unraid.docker.webui: '' + net.unraid.docker.shell: '' diff --git a/it-tools/docker-compose.yml b/it-tools/docker-compose.yml new file mode 100644 index 0000000..ca2c298 --- /dev/null +++ b/it-tools/docker-compose.yml @@ -0,0 +1,12 @@ +services: + it-tools: + image: 'corentinth/it-tools:latest' + networks: + - pangolin + labels: + folder.view2: "Services" + +networks: + pangolin: + name: pangolin_net + external: true diff --git a/it-tools/name b/it-tools/name new file mode 100644 index 0000000..b9ea027 --- /dev/null +++ b/it-tools/name @@ -0,0 +1 @@ +it-tools \ No newline at end of file diff --git a/large-language-models/docker-compose.yml b/large-language-models/docker-compose.yml index eb3327e..c9fabc8 100644 --- a/large-language-models/docker-compose.yml +++ b/large-language-models/docker-compose.yml @@ -1,8 +1,6 @@ services: ollama: image: ollama/ollama:latest - container_name: ollama - pull_policy: always tty: true ports: - "11434:11434" # Ollama API @@ -18,7 +16,6 @@ services: openwebui: image: ghcr.io/open-webui/open-webui:main-slim - container_name: openwebui depends_on: - ollama ports: diff --git a/password-manager/docker-compose.yml b/password-manager/docker-compose.yml index 51f5195..912f7b1 100644 --- a/password-manager/docker-compose.yml +++ b/password-manager/docker-compose.yml @@ -1,9 +1,8 @@ services: vaultwarden: image: vaultwarden/server:latest - container_name: vaultwarden environment: - DOMAIN: "https://vw.homecube.org" + DOMAIN: ${DOMAIN} ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN} volumes: - /mnt/user/appdata/vaultwarden/data:/data/ diff --git a/proxy/docker-compose.override.yml b/proxy/docker-compose.override.yml index 4227253..8517f4f 100644 --- a/proxy/docker-compose.override.yml +++ b/proxy/docker-compose.override.yml @@ -2,6 +2,6 @@ services: newt: labels: net.unraid.docker.managed: 'composeman' - net.unraid.docker.icon: '' + net.unraid.docker.icon: 'https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/pangolin.png' net.unraid.docker.webui: 'https://proxy.homecube.org' net.unraid.docker.shell: '' diff --git a/proxy/docker-compose.yml b/proxy/docker-compose.yml index 3224adf..80c5772 100644 --- a/proxy/docker-compose.yml +++ b/proxy/docker-compose.yml @@ -1,13 +1,24 @@ services: newt: - image: fosrl/newt:1.4.0 + image: fosrl/newt:1.6.0 + networks: + - pangolin container_name: newt restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro environment: - PANGOLIN_ENDPOINT=https://proxy.homecube.org - NEWT_ID=t3brmb1mgj1tlgk - NEWT_SECRET=kyxmtlcd8l5s5ifc2u3j7c3uvydlr900hns1sj5pejkjxytg + - DOCKER_SOCKET=/var/run/docker.sock + - DOCKER_ENFORCE_NETWORK_VALIDATION=true labels: net.unraid.docker.icon: "https://raw.githubusercontent.com/homarr-labs/dashboard-icons/refs/heads/main/png/pangolin.png" net.unraid.docker.webui: "https://proxy.homecube.org" folder.view2: "Networking" + +networks: + pangolin: + name: pangolin_net + driver: bridge