From b8eb8542161f757d215ce4c4b0383a165a7bfbe7 Mon Sep 17 00:00:00 2001 From: Artur <33733651+Keeqler@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:34:47 -0300 Subject: [PATCH] chore(docker-compose.prod.yml): better container and hostname naming --- config/redis.ts | 5 ++++- docker-compose.prod.yml | 40 ++++++++++++++++++++++++---------------- docker-compose.yml | 24 ++++++++++++------------ nginx.conf | 4 ++-- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/config/redis.ts b/config/redis.ts index 7d0b564..1e8b212 100644 --- a/config/redis.ts +++ b/config/redis.ts @@ -1,3 +1,6 @@ import { ConnectionOptions } from 'bullmq' -export const redisConnection: ConnectionOptions = { host: 'redis', port: 6379, url: 'redis:6379' } +export const redisConnection: ConnectionOptions = { + host: 'magic-redis', + port: 6379, +} diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 434f8aa..f865a93 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,36 +1,35 @@ services: - cloudflared: + magic-cloudflared: image: cloudflare/cloudflared:latest - container_name: cloudflared + container_name: magic-cloudflared restart: unless-stopped command: tunnel --no-autoupdate run environment: TUNNEL_TOKEN: ${CLOUDFLARE_TUNNEL_TOKEN} REAL_IP_HEADER: Cf-Connecting-Ip + networks: + - strapi-shared-network depends_on: - - nginx + - magic-nginx - nginx: + magic-nginx: image: nginx:1 - container_name: nginx + container_name: magic-nginx restart: unless-stopped ports: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf + networks: + - strapi-shared-network depends_on: - - app + - magic-app - redis: - container_name: redis - image: redis:7-alpine - restart: unless-stopped - - app: + magic-app: build: context: . dockerfile: Dockerfile - container_name: app + container_name: magic-app restart: unless-stopped environment: NODE_ENV: production @@ -81,13 +80,20 @@ services: NEXT_PUBLIC_PRIVACY_GUIDES_APPLICATION_RECIPIENT: monerofund@magicgrants.org NEXT_PUBLIC_GENERAL_APPLICATION_RECIPIENT: monerofund@magicgrants.org depends_on: - - postgres + - magic-postgres networks: - strapi-shared-network - postgres: + magic-redis: + container_name: magic-redis + image: redis:7-alpine + restart: unless-stopped + networks: + - strapi-shared-network + + magic-postgres: image: postgres:16-alpine - container_name: postgres + container_name: magic-postgres restart: unless-stopped environment: POSTGRES_USER: magic @@ -95,6 +101,8 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} volumes: - 'postgres_data:/var/lib/postgresql/data' + networks: + - strapi-shared-network volumes: postgres_data: diff --git a/docker-compose.yml b/docker-compose.yml index e98fe96..14376b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,12 @@ services: - redis: + magic-redis: container_name: magic-redis image: redis:7-alpine restart: unless-stopped - btcpayserver: + magic-btcpayserver: restart: unless-stopped - container_name: generated_btcpayserver_1 + container_name: magic-btcpayserver image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.13.3-altcoins} expose: - '49392' @@ -43,9 +43,9 @@ services: - 'tor_torrcdir:/usr/local/etc/tor/' ports: - '49392:49392' - monerod_wallet: + magic-monerod-wallet: restart: unless-stopped - container_name: btcpayserver_monero_wallet + container_name: magic-monerod-wallet image: btcpayserver/monero:0.18.3.3 entrypoint: monero-wallet-rpc --rpc-bind-ip=0.0.0.0 --disable-rpc-login --confirm-external-bind --rpc-bind-port=18082 --non-interactive --trusted-daemon --daemon-address=xmr-node.cakewallet.com:18081 --wallet-file=/wallet/wallet --password-file /wallet/password --tx-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s" expose: @@ -55,9 +55,9 @@ services: volumes: - 'xmr_wallet:/wallet' - nbxplorer: + magic-nbxplorer: restart: unless-stopped - container_name: generated_nbxplorer_1 + container_name: magic-nbxplorer image: nicolasdorier/nbxplorer:2.5.2 expose: - '32838' @@ -75,9 +75,9 @@ services: volumes: - 'nbxplorer_datadir:/datadir' - btcpay-postgres: + magic-btcpay-postgres: restart: unless-stopped - container_name: generated_postgres_1 + container_name: magic-btcpay-postgres shm_size: 256mb image: btcpayserver/postgres:13.13 command: ['-c', 'random_page_cost=1.0', '-c', 'shared_preload_libraries=pg_stat_statements'] @@ -99,7 +99,7 @@ services: volumes: - 'magic_postgres_data:/var/lib/postgresql/data' - keycloak: + magic-keycloak: image: quay.io/keycloak/keycloak:25.0.6 container_name: magic-keycloak restart: unless-stopped @@ -110,9 +110,9 @@ services: KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN_PASSWORD: admin - campaign-site: + magic-app: image: node:20-alpine - container_name: magic-campaign-site + container_name: magic-app restart: unless-stopped working_dir: /app command: npm run dev diff --git a/nginx.conf b/nginx.conf index a6cd5e7..bbacf78 100644 --- a/nginx.conf +++ b/nginx.conf @@ -10,7 +10,7 @@ http { server_name donate.magicgrants.org; location / { - proxy_pass http://app:3000; + proxy_pass http://magic-app:3000; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -19,7 +19,7 @@ http { } location /api { - proxy_pass http://app:3000/api; + proxy_pass http://magic-app:3000/api; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;