From ff1e36b25a7f4cd0f143a5706fae4ef75723a061 Mon Sep 17 00:00:00 2001 From: mifi Date: Thu, 12 Feb 2026 15:46:57 -0300 Subject: [PATCH] Consolidate services; pipeline edits --- .woodpecker/deploy.yaml | 8 +++++++ docker-compose.yml | 52 +++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/.woodpecker/deploy.yaml b/.woodpecker/deploy.yaml index f678d7a..56c690d 100644 --- a/.woodpecker/deploy.yaml +++ b/.woodpecker/deploy.yaml @@ -1,5 +1,13 @@ # Deploy: build image, push to registry, trigger Portainer stack redeploy. # Runs on push/tag/manual to main only, after ci workflow succeeds. +# no need to clone, we're just pinging a webhook +skip_clone: true + +# Use writable workspace when clone is skipped (no root clone step to create /woodpecker/src) +workspace: + base: /tmp + path: deploy + when: - branch: main event: [push, tag, manual] diff --git a/docker-compose.yml b/docker-compose.yml index 6406512..a9a3854 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: mta-sts: image: git.mifi.dev/mifi-holdings/mta-sts:latest - container_name: mta-sts + container_name: mail-mta-sts healthcheck: test: ["CMD", "wget", "--spider", "-q", "http://localhost"] interval: 30s @@ -13,134 +13,120 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=traefik" + # Single backend: all routers use this service + - "traefik.http.services.mta-sts.loadbalancer.server.port=80" # mifi.holdings - "traefik.http.routers.mta-sts-mifi-holdings.rule=Host(`mta-sts.mifi.holdings`)" - "traefik.http.routers.mta-sts-mifi-holdings.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-holdings.tls=true" - "traefik.http.routers.mta-sts-mifi-holdings.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-holdings.service=mta-sts-mifi-holdings" - - "traefik.http.services.mta-sts-mifi-holdings.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-holdings.service=mta-sts" # mifi.com.br - "traefik.http.routers.mta-sts-mifi-com-br.rule=Host(`mta-sts.mifi.com.br`)" - "traefik.http.routers.mta-sts-mifi-com-br.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-com-br.tls=true" - "traefik.http.routers.mta-sts-mifi-com-br.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-com-br.service=mta-sts-mifi-com-br" - - "traefik.http.services.mta-sts-mifi-com-br.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-com-br.service=mta-sts" # mifi.dev - "traefik.http.routers.mta-sts-mifi-dev.rule=Host(`mta-sts.mifi.dev`)" - "traefik.http.routers.mta-sts-mifi-dev.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-dev.tls=true" - "traefik.http.routers.mta-sts-mifi-dev.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-dev.service=mta-sts-mifi-dev" - - "traefik.http.services.mta-sts-mifi-dev.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-dev.service=mta-sts" # mifi.ventures - "traefik.http.routers.mta-sts-mifi-ventures.rule=Host(`mta-sts.mifi.ventures`)" - "traefik.http.routers.mta-sts-mifi-ventures.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-ventures.tls=true" - "traefik.http.routers.mta-sts-mifi-ventures.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-ventures.service=mta-sts-mifi-ventures" - - "traefik.http.services.mta-sts-mifi-ventures.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-ventures.service=mta-sts" # mifi.vix.br - "traefik.http.routers.mta-sts-mifi-vix-br.rule=Host(`mta-sts.mifi.vix.br`)" - "traefik.http.routers.mta-sts-mifi-vix-br.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-vix-br.tls=true" - "traefik.http.routers.mta-sts-mifi-vix-br.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-vix-br.service=mta-sts-mifi-vix-br" - - "traefik.http.services.mta-sts-mifi-vix-br.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-vix-br.service=mta-sts" # mifi.me - "traefik.http.routers.mta-sts-mifi-me.rule=Host(`mta-sts.mifi.me`)" - "traefik.http.routers.mta-sts-mifi-me.entrypoints=websecure" - "traefik.http.routers.mta-sts-mifi-me.tls=true" - "traefik.http.routers.mta-sts-mifi-me.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mifi-me.service=mta-sts-mifi-me" - - "traefik.http.services.mta-sts-mifi-me.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mifi-me.service=mta-sts" # blackice.vix.br - "traefik.http.routers.mta-sts-blackice-vix-br.rule=Host(`mta-sts.blackice.vix.br`)" - "traefik.http.routers.mta-sts-blackice-vix-br.entrypoints=websecure" - "traefik.http.routers.mta-sts-blackice-vix-br.tls=true" - "traefik.http.routers.mta-sts-blackice-vix-br.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-blackice-vix-br.service=mta-sts-blackice-vix-br" - - "traefik.http.services.mta-sts-blackice-vix-br.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-blackice-vix-br.service=mta-sts" # fitz.guru - "traefik.http.routers.mta-sts-fitz-guru.rule=Host(`mta-sts.fitz.guru`)" - "traefik.http.routers.mta-sts-fitz-guru.entrypoints=websecure" - "traefik.http.routers.mta-sts-fitz-guru.tls=true" - "traefik.http.routers.mta-sts-fitz-guru.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-fitz-guru.service=mta-sts-fitz-guru" - - "traefik.http.services.mta-sts-fitz-guru.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-fitz-guru.service=mta-sts" # umlautpress.com - "traefik.http.routers.mta-sts-umlautpress-com.rule=Host(`mta-sts.umlautpress.com`)" - "traefik.http.routers.mta-sts-umlautpress-com.entrypoints=websecure" - "traefik.http.routers.mta-sts-umlautpress-com.tls=true" - "traefik.http.routers.mta-sts-umlautpress-com.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-umlautpress-com.service=mta-sts-umlautpress-com" - - "traefik.http.services.mta-sts-umlautpress-com.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-umlautpress-com.service=mta-sts" # camilla-rena.com - "traefik.http.routers.mta-sts-camilla-rena-com.rule=Host(`mta-sts.camilla-rena.com`)" - "traefik.http.routers.mta-sts-camilla-rena-com.entrypoints=websecure" - "traefik.http.routers.mta-sts-camilla-rena-com.tls=true" - "traefik.http.routers.mta-sts-camilla-rena-com.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-camilla-rena-com.service=mta-sts-camilla-rena-com" - - "traefik.http.services.mta-sts-camilla-rena-com.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-camilla-rena-com.service=mta-sts" # officelift.net - "traefik.http.routers.mta-sts-officelift-net.rule=Host(`mta-sts.officelift.net`)" - "traefik.http.routers.mta-sts-officelift-net.entrypoints=websecure" - "traefik.http.routers.mta-sts-officelift-net.tls=true" - "traefik.http.routers.mta-sts-officelift-net.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-officelift-net.service=mta-sts-officelift-net" - - "traefik.http.services.mta-sts-officelift-net.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-officelift-net.service=mta-sts" # mylocalpro.biz - "traefik.http.routers.mta-sts-mylocalpro-biz.rule=Host(`mta-sts.mylocalpro.biz`)" - "traefik.http.routers.mta-sts-mylocalpro-biz.entrypoints=websecure" - "traefik.http.routers.mta-sts-mylocalpro-biz.tls=true" - "traefik.http.routers.mta-sts-mylocalpro-biz.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mylocalpro-biz.service=mta-sts-mylocalpro-biz" - - "traefik.http.services.mta-sts-mylocalpro-biz.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mylocalpro-biz.service=mta-sts" # mylocalpro.online - "traefik.http.routers.mta-sts-mylocalpro-online.rule=Host(`mta-sts.mylocalpro.online`)" - "traefik.http.routers.mta-sts-mylocalpro-online.entrypoints=websecure" - "traefik.http.routers.mta-sts-mylocalpro-online.tls=true" - "traefik.http.routers.mta-sts-mylocalpro-online.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-mylocalpro-online.service=mta-sts-mylocalpro-online" - - "traefik.http.services.mta-sts-mylocalpro-online.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-mylocalpro-online.service=mta-sts" # happybeardedcarpenter.com - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.rule=Host(`mta-sts.happybeardedcarpenter.com`)" - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.entrypoints=websecure" - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.tls=true" - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.service=mta-sts-happybeardedcarpenter-com" - - "traefik.http.services.mta-sts-happybeardedcarpenter-com.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-happybeardedcarpenter-com.service=mta-sts" # thenewenglandpalletguy.com - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.rule=Host(`mta-sts.thenewenglandpalletguy.com`)" - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.entrypoints=websecure" - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.tls=true" - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.service=mta-sts-thenewenglandpalletguy-com" - - "traefik.http.services.mta-sts-thenewenglandpalletguy-com.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-thenewenglandpalletguy-com.service=mta-sts" # dining-it.com - "traefik.http.routers.mta-sts-dining-it-com.rule=Host(`mta-sts.dining-it.com`)" - "traefik.http.routers.mta-sts-dining-it-com.entrypoints=websecure" - "traefik.http.routers.mta-sts-dining-it-com.tls=true" - "traefik.http.routers.mta-sts-dining-it-com.tls.certresolver=letsencrypt" - - "traefik.http.routers.mta-sts-dining-it-com.service=mta-sts-dining-it-com" - - "traefik.http.services.mta-sts-dining-it-com.loadbalancer.server.port=80" + - "traefik.http.routers.mta-sts-dining-it-com.service=mta-sts" restart: unless-stopped