From fe4476d774a28b50ffcd9ff8b2c135c3fe71d604 Mon Sep 17 00:00:00 2001 From: Zhongheng Liu Date: Sun, 18 Oct 2026 17:16:54 +0200 Subject: [PATCH] compose v2 setup --- core/docker-compose.yml | 8 +++++++- docker-compose.yml | 2 +- domains/alphamill.gr/docker-compose.yml | 6 ++++++ domains/alphamill.gr/mail/docker-compose.yml | 11 +++++------ domains/alphamill.gr/site/docker-compose.yml | 18 ++++++++++++++++++ domains/alphamill.gr/site/src | 2 +- 6 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 domains/alphamill.gr/docker-compose.yml create mode 100644 domains/alphamill.gr/site/docker-compose.yml diff --git a/core/docker-compose.yml b/core/docker-compose.yml index 8907fe6..bc196df 100644 --- a/core/docker-compose.yml +++ b/core/docker-compose.yml @@ -5,12 +5,14 @@ services: image: traefik:v3.7 command: - "--api.insecure=true" + - "--providers.docker=true" - "--providers.file.directory=/etc/traefik/apps" - "--providers.file.watch=true" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - "--entrypoints.minecraft.address=:25565/tcp" - - "--entrypoints.webseure.http.tls=true" + - "--entrypoints.websecure.http.tls=true" + - "--log.level=DEBUG" ports: - "80:80" # Web HTTP services entrypoint - "443:443" # Web HTTPS services entrypoint @@ -24,6 +26,10 @@ services: networks: auth_net: + name: "auth-net" + external: false driver: bridge proxy_net: + name: "proxy-net" + external: false driver: bridge diff --git a/docker-compose.yml b/docker-compose.yml index e7f9d51..c0aaf13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ include: - ./core/docker-compose.yml # stvnliu.me project compose file - - ./domains/stvnliu.me/docker-compose.yml + # - ./domains/stvnliu.me/docker-compose.yml # alphamill.gr project compose file - ./domains/alphamill.gr/docker-compose.yml diff --git a/domains/alphamill.gr/docker-compose.yml b/domains/alphamill.gr/docker-compose.yml new file mode 100644 index 0000000..7e520c2 --- /dev/null +++ b/domains/alphamill.gr/docker-compose.yml @@ -0,0 +1,6 @@ +include: + - path: ./site/docker-compose.yml + +networks: + proxy_net: + external: true diff --git a/domains/alphamill.gr/mail/docker-compose.yml b/domains/alphamill.gr/mail/docker-compose.yml index ff1b033..e89f25c 100644 --- a/domains/alphamill.gr/mail/docker-compose.yml +++ b/domains/alphamill.gr/mail/docker-compose.yml @@ -3,24 +3,23 @@ volumes: rcm_alphamill_db: networks: - alphamill_net: - external: true - default_net: + proxy_net: + name: "proxy-net" external: true services: webmail: container_name: alphamill_webmail + image: roundcube/roundcubemail:latest volumes: - rcm_alphamill_web:/var/www/html - rcm_alphamill_db:/var/roundcube/db networks: - - alphamill_net - - default_net + - proxy_net environment: - ROUNDCUBEMAIL_DB_TYPE=sqlite - ROUNDCUBEMAIL_SKIN=elastic - - ROUNDCUBEMAIL_DEFAULT_HOST=tls://imap.purelymail.com + - ROUNDCUBEMAIL_DEFAULT_HOST=ssl://imap.purelymail.com - ROUNDCUBEMAIL_DEFAULT_PORT=993 - ROUNDCUBEMAIL_SMTP_SERVER=tls://imap.purelymail.com - ROUNDCUBEMAIL_SMTP_PORT=587 diff --git a/domains/alphamill.gr/site/docker-compose.yml b/domains/alphamill.gr/site/docker-compose.yml new file mode 100644 index 0000000..2d0e250 --- /dev/null +++ b/domains/alphamill.gr/site/docker-compose.yml @@ -0,0 +1,18 @@ +networks: + proxy_net: + name: "proxy-net" + external: true +services: + alphamill: + container_name: alphamill_site + image: custom/alphamill_site + build: + context: ./src + dockerfile: ./Dockerfile + networks: + - proxy_net + labels: + - traefik.http.routers.alphamill-site-container.rule=Host(`alphamill.gr`) + - traefik.http.services.alphamill-site-service.loadbalancer.server.port=3000 + # ports: + # - 8080:3000 diff --git a/domains/alphamill.gr/site/src b/domains/alphamill.gr/site/src index 831dfd8..22809a9 160000 --- a/domains/alphamill.gr/site/src +++ b/domains/alphamill.gr/site/src @@ -1 +1 @@ -Subproject commit 831dfd8db1eaa561ab8c20c75a54b742468da864 +Subproject commit 22809a9db3f385b7a17f17c327f24164092242b8