keshop.bieda.it deploy fixes

2023-05-21 22:34:21 +00:00 · 2023-05-21 22:34:21 +00:00 · 0213ecbadf
commit 0213ecbadf
parent 6775eeafe6
2 changed files with 110 additions and 106 deletions
--- a/deploy/egommerce-stack.dev.yml
+++ b/deploy/egommerce-stack.dev.yml
@ -4,24 +4,24 @@ services:
  # INFRASTRUCTURE SERVICES
  api-gateway:
    image: git.pbiernat.dev/egommerce/api-gateway:dev
-    hostname: egommerce.pbiernat.dev
+    hostname: api-gateway
    environment:
-      - APP_DOMAIN=egommerce.pbiernat.dev
+      - APP_DOMAIN=api-gateway
    volumes:
      - ./certs/api-gateway:/etc/traefik/certs

  api-registry:
    image: git.pbiernat.dev/egommerce/api-registry:dev
-    hostname: registry.egommerce.pbiernat.dev
+    hostname: api-registry
    environment:
-      - APP_DOMAIN=registry.egommerce.pbiernat.dev
+      - APP_DOMAIN=api-registry
      - CONSUL_HTTP_TOKEN=devop

  api-eventbus:
    image: git.pbiernat.dev/egommerce/api-eventbus:dev
-    hostname: eventbus.egommerce.pbiernat.dev
+    hostname: api-eventbus
    environment:
-      - APP_DOMAIN=eventbus.egommerce.pbiernat.dev
+      - APP_DOMAIN=api-eventbus
      # - RABBITMQ_NODENAME=api-eventbus
      # - RABBITMQ_USE_LONGNAME=true
      # - RABBITMQ_DEFAULT_USER = admin
@ -34,84 +34,84 @@ services:

  api-logger:
    image: git.pbiernat.dev/egommerce/api-logger:dev
-    hostname: logger.egommerce.pbiernat.dev
+    hostname: api-logger
    environment:
-      - APP_DOMAIN=logger.egommerce.pbiernat.dev
+      - APP_DOMAIN=api-logger

-  api-prometheus:
+  #api-prometheus:
    # image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
-    hostname: prometheus.egommerce.pbiernat.dev
-    environment:
-      - APP_DOMAIN=prometheus.egommerce.pbiernat.dev
+  #  hostname: prometheus.keshop.bieda.it
+  #  environment:
+  #    - APP_DOMAIN=prometheus.keshop.bieda.it

-  api-grafana:
+  #api-grafana:
    # image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
-    hostname: grafana.egommerce.pbiernat.dev
-    environment:
-      - APP_DOMAIN=grafana.egommerce.pbiernat.dev
+  #  hostname: grafana.keshop.bieda.it
+  #  environment:
+  #    - APP_DOMAIN=grafana.keshop.bieda.it

  postgres-db:
-    hostname: db.egommerce.pbiernat.dev
+    hostname: postgres-db
    environment:
-      - APP_DOMAIN=db.egommerce.pbiernat.dev
+      - APP_DOMAIN=postgres-db
      - POSTGRES_PASSWORD=12345678
    # ports:
    #   - '5432:5432'

  mongo-db:
-    hostname: mongodb.egommerce.pbiernat.dev
+    hostname: mongodb.keshop.bieda.it
    environment:
-      - APP_DOMAIN=mongodb.egommerce.pbiernat.dev
+      - APP_DOMAIN=mongodb-db
      - MONGO_INITDB_ROOT_PASSWORD=12345678

  # API micro-services
  identity-svc:
    image: git.pbiernat.dev/egommerce/identity-svc:dev
    environment:
-      - APP_DOMAIN=identity.api.egommerce.pbiernat.dev
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - APP_DOMAIN=identity-svc
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
    volumes:
      - ./certs/api-gateway:/certs

  basket-svc:
    image: git.pbiernat.dev/egommerce/basket-svc:dev
    environment:
-      - APP_DOMAIN=basket.api.egommerce.pbiernat.dev
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - APP_DOMAIN=basket-svc
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
    volumes:
      - ./certs/api-gateway:/certs

  catalog-svc:
    image: git.pbiernat.dev/egommerce/catalog-svc:dev
    environment:
-      - APP_DOMAIN=catalog.api.egommerce.pbiernat.dev
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - APP_DOMAIN=catalog-svc
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
    volumes:
      - ./certs/api-gateway:/certs

  pricing-svc:
    image: git.pbiernat.dev/egommerce/pricing-svc:dev
    environment:
-      - APP_DOMAIN=pricing.api.egommerce.pbiernat.dev
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - APP_DOMAIN=pricing-svc
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
    volumes:
      - ./certs/api-gateway:/certs

  order-svc:
    image: git.pbiernat.dev/egommerce/order-svc:dev
    environment:
-      - APP_DOMAIN=order.api.egommerce.pbiernat.dev
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - APP_DOMAIN=order-svc
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
    volumes:
      - ./certs/api-gateway:/certs

@ -119,27 +119,28 @@ services:
  basket-worker:
    image: git.pbiernat.dev/egommerce/basket-worker:dev
    environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672

  catalog-worker:
    image: git.pbiernat.dev/egommerce/catalog-worker:dev
    environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672

  pricing-worker:
    image: git.pbiernat.dev/egommerce/pricing-worker:dev
    environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672

  order-worker:
    image: git.pbiernat.dev/egommerce/order-worker:dev
    environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
+      - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
+      - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
+
--- a/deploy/egommerce-stack.yml
+++ b/deploy/egommerce-stack.yml
@ -61,42 +61,42 @@ services:
    networks:
      - api-logger-network
  
-  api-prometheus:
-    image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
-    user: root
-    environment:
-      - APP_NAME=api-prometheus
-      - APP_DOMAIN
-    volumes:
-      - ./etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - api-prometheus-network
-      - api-grafana-network
-      - api-gateway-network
-      - api-registry-network
-      - api-eventbus-network
+  #api-prometheus:
+  #  image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
+  #  user: root
+  #  environment:
+  #    - APP_NAME=api-prometheus
+  #    - APP_DOMAIN
+  #  volumes:
+  #    - ./etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+  #    - /var/run/docker.sock:/var/run/docker.sock
+  #  networks:
+  #    - api-prometheus-network
+      #- api-grafana-network
+  #    - api-gateway-network
+  #    - api-registry-network
+  #    - api-eventbus-network
      # - api-cache-network
      # - api-logger-network
-      - basket-svc-network
-      - basket-worker-network
-      - catalog-svc-network
-      - catalog-worker-network
-      - identity-svc-network
-      - order-svc-network
-      - order-worker-network
-      - pricing-svc-network
-      - pricing-worker-network
+  #    - basket-svc-network
+  #    - basket-worker-network
+  #    - catalog-svc-network
+  #    - catalog-worker-network
+  #    - identity-svc-network
+  #    - order-svc-network
+  #    - order-worker-network
+  #    - pricing-svc-network
+  #    - pricing-worker-network

-  api-grafana:
-    image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
-    environment:
-      - APP_NAME=api-grafana
-      - APP_DOMAIN
-    volumes:
-      - grafana-db:/var/lib/grafana
-    networks:
-      - api-grafana-network
+  #api-grafana:
+  #  image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
+  #  environment:
+  #    - APP_NAME=api-grafana
+  #    - APP_DOMAIN
+  #  volumes:
+  #    - grafana-db:/var/lib/grafana
+  #  networks:
+  #    - api-grafana-network

  postgres-db:
    image: postgres:14.1-alpine
@ -161,6 +161,8 @@ services:
      - ./db_migrations/basket-svc:/migrations
    networks:
      - basket-svc-network
+      - order-svc-network
+      - pricing-svc-network
      - api-gateway-network
      - api-registry-network
      - api-eventbus-network
@ -305,65 +307,65 @@ volumes:
  registry_data: ~
  eventbus_data: ~
  eventbus_logs: ~
-  grafana-db: ~
+  #grafana-db: ~

 networks:
  api-gateway-network:
    driver: overlay
-    internal: true
+    #internal: true

  api-registry-network:
    driver: overlay
-    internal: true
+    #internal: true

  api-eventbus-network:
    driver: overlay
-    internal: true
+    #internal: true

  api-cache-network:
    driver: overlay
-    internal: true
+    #internal: true

  api-logger-network:
    driver: overlay
-    internal: true
+    #internal: true
  
  api-prometheus-network:
    driver: overlay
-    internal: true
+    #internal: true

-  api-grafana-network:
-    driver: overlay
-    internal: true
+  #api-grafana-network:
+  #  driver: overlay
+  #  internal: true

  postgres-db-network:
    driver: overlay
-    internal: true
+    #internal: true

  mongodb-db-network:
    driver: overlay
-    internal: true
+    #internal: true

  # api micro-services networks
  identity-svc-network:
    driver: overlay
-    internal: true
+    #internal: true

  basket-svc-network:
    driver: overlay
-    internal: true
+    #internal: true

  catalog-svc-network:
    driver: overlay
-    internal: true
+    #internal: true

  pricing-svc-network:
    driver: overlay
-    internal: true
+    #internal: true

  order-svc-network:
    driver: overlay
-    internal: true
+    #internal: true

  # Workers networks
  # identity-worker-network:
@ -372,16 +374,17 @@ networks:

  basket-worker-network:
    driver: overlay
-    internal: true
+    #internal: true

  catalog-worker-network:
    driver: overlay
-    internal: true
+    #internal: true

  pricing-worker-network:
    driver: overlay
-    internal: true
+    #internal: true

  order-worker-network:
    driver: overlay
-    internal: true
+    #internal: true
+