From 70dc6d0992bff10faf0287bfb79b6361cab2bc9f Mon Sep 17 00:00:00 2001 From: Leon Morival Date: Tue, 19 May 2026 19:12:25 +0200 Subject: [PATCH] feat: fix networks --- .gitea/workflows/deploy.yml | 5 +++-- config/deploy.yml | 12 ++++++++++++ docker-compose.prod.yml | 12 ++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 1b40efa..4298e3f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -100,11 +100,12 @@ jobs: ssh "$REMOTE_USER@$REMOTE_HOST" <<'"'"'REMOTE'"'"' set -eu - docker network inspect kamal >/dev/null 2>&1 || docker network create kamal + docker network inspect bemeal_public >/dev/null 2>&1 || docker network create bemeal_public + docker network inspect bemeal_internal >/dev/null 2>&1 || docker network create bemeal_internal for container in bemeal-pgsql bemeal-redis bemeal-meilisearch bemeal-adminer; do if docker inspect "$container" >/dev/null 2>&1; then - docker network connect kamal "$container" >/dev/null 2>&1 || true + docker network connect bemeal_internal "$container" >/dev/null 2>&1 || true fi done REMOTE diff --git a/config/deploy.yml b/config/deploy.yml index 84c2d9f..d6dabd1 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -4,15 +4,27 @@ image: daily_meal/bemeal-api x-hosts: &hosts - <%= ENV.fetch("SSH_HOST", "89.167.35.217") %> +x-web-networks: &web-networks + network: + - bemeal_public + - bemeal_internal + +x-worker-networks: &worker-networks + network: + - bemeal_internal + servers: web: hosts: *hosts + options: *web-networks horizon: hosts: *hosts cmd: php artisan horizon + options: *worker-networks scheduler: hosts: *hosts cmd: php artisan schedule:work + options: *worker-networks proxy: host: bemeal.leonmorival.com diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index caf5c7e..95aca54 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -17,7 +17,7 @@ services: timeout: 5s retries: 10 networks: - - kamal + - internal redis: image: redis:alpine @@ -26,7 +26,7 @@ services: volumes: - redis-data:/data networks: - - kamal + - internal adminer: image: adminer:latest @@ -35,7 +35,7 @@ services: environment: ADMINER_DEFAULT_SERVER: bemeal-pgsql networks: - - kamal + - internal meilisearch: image: getmeili/meilisearch:latest @@ -47,7 +47,7 @@ services: volumes: - meilisearch-data:/meili_data networks: - - kamal + - internal volumes: pgsql-data: @@ -61,6 +61,6 @@ volumes: name: bemeal_meilisearch_data networks: - kamal: + internal: external: true - name: kamal + name: bemeal_internal