keshop.bieda.it deploy fixes

This commit is contained in:
root 2023-05-21 22:34:21 +00:00
parent 6775eeafe6
commit 0213ecbadf
2 changed files with 110 additions and 106 deletions

View File

@ -4,24 +4,24 @@ services:
# INFRASTRUCTURE SERVICES # INFRASTRUCTURE SERVICES
api-gateway: api-gateway:
image: git.pbiernat.dev/egommerce/api-gateway:dev image: git.pbiernat.dev/egommerce/api-gateway:dev
hostname: egommerce.pbiernat.dev hostname: api-gateway
environment: environment:
- APP_DOMAIN=egommerce.pbiernat.dev - APP_DOMAIN=api-gateway
volumes: volumes:
- ./certs/api-gateway:/etc/traefik/certs - ./certs/api-gateway:/etc/traefik/certs
api-registry: api-registry:
image: git.pbiernat.dev/egommerce/api-registry:dev image: git.pbiernat.dev/egommerce/api-registry:dev
hostname: registry.egommerce.pbiernat.dev hostname: api-registry
environment: environment:
- APP_DOMAIN=registry.egommerce.pbiernat.dev - APP_DOMAIN=api-registry
- CONSUL_HTTP_TOKEN=devop - CONSUL_HTTP_TOKEN=devop
api-eventbus: api-eventbus:
image: git.pbiernat.dev/egommerce/api-eventbus:dev image: git.pbiernat.dev/egommerce/api-eventbus:dev
hostname: eventbus.egommerce.pbiernat.dev hostname: api-eventbus
environment: environment:
- APP_DOMAIN=eventbus.egommerce.pbiernat.dev - APP_DOMAIN=api-eventbus
# - RABBITMQ_NODENAME=api-eventbus # - RABBITMQ_NODENAME=api-eventbus
# - RABBITMQ_USE_LONGNAME=true # - RABBITMQ_USE_LONGNAME=true
# - RABBITMQ_DEFAULT_USER = admin # - RABBITMQ_DEFAULT_USER = admin
@ -34,84 +34,84 @@ services:
api-logger: api-logger:
image: git.pbiernat.dev/egommerce/api-logger:dev image: git.pbiernat.dev/egommerce/api-logger:dev
hostname: logger.egommerce.pbiernat.dev hostname: api-logger
environment: 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)... # image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
hostname: prometheus.egommerce.pbiernat.dev # hostname: prometheus.keshop.bieda.it
environment: # environment:
- APP_DOMAIN=prometheus.egommerce.pbiernat.dev # - APP_DOMAIN=prometheus.keshop.bieda.it
api-grafana: #api-grafana:
# image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)... # image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
hostname: grafana.egommerce.pbiernat.dev # hostname: grafana.keshop.bieda.it
environment: # environment:
- APP_DOMAIN=grafana.egommerce.pbiernat.dev # - APP_DOMAIN=grafana.keshop.bieda.it
postgres-db: postgres-db:
hostname: db.egommerce.pbiernat.dev hostname: postgres-db
environment: environment:
- APP_DOMAIN=db.egommerce.pbiernat.dev - APP_DOMAIN=postgres-db
- POSTGRES_PASSWORD=12345678 - POSTGRES_PASSWORD=12345678
# ports: # ports:
# - '5432:5432' # - '5432:5432'
mongo-db: mongo-db:
hostname: mongodb.egommerce.pbiernat.dev hostname: mongodb.keshop.bieda.it
environment: environment:
- APP_DOMAIN=mongodb.egommerce.pbiernat.dev - APP_DOMAIN=mongodb-db
- MONGO_INITDB_ROOT_PASSWORD=12345678 - MONGO_INITDB_ROOT_PASSWORD=12345678
# API micro-services # API micro-services
identity-svc: identity-svc:
image: git.pbiernat.dev/egommerce/identity-svc:dev image: git.pbiernat.dev/egommerce/identity-svc:dev
environment: environment:
- APP_DOMAIN=identity.api.egommerce.pbiernat.dev - APP_DOMAIN=identity-svc
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
volumes: volumes:
- ./certs/api-gateway:/certs - ./certs/api-gateway:/certs
basket-svc: basket-svc:
image: git.pbiernat.dev/egommerce/basket-svc:dev image: git.pbiernat.dev/egommerce/basket-svc:dev
environment: environment:
- APP_DOMAIN=basket.api.egommerce.pbiernat.dev - APP_DOMAIN=basket-svc
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
volumes: volumes:
- ./certs/api-gateway:/certs - ./certs/api-gateway:/certs
catalog-svc: catalog-svc:
image: git.pbiernat.dev/egommerce/catalog-svc:dev image: git.pbiernat.dev/egommerce/catalog-svc:dev
environment: environment:
- APP_DOMAIN=catalog.api.egommerce.pbiernat.dev - APP_DOMAIN=catalog-svc
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
volumes: volumes:
- ./certs/api-gateway:/certs - ./certs/api-gateway:/certs
pricing-svc: pricing-svc:
image: git.pbiernat.dev/egommerce/pricing-svc:dev image: git.pbiernat.dev/egommerce/pricing-svc:dev
environment: environment:
- APP_DOMAIN=pricing.api.egommerce.pbiernat.dev - APP_DOMAIN=pricing-svc
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
volumes: volumes:
- ./certs/api-gateway:/certs - ./certs/api-gateway:/certs
order-svc: order-svc:
image: git.pbiernat.dev/egommerce/order-svc:dev image: git.pbiernat.dev/egommerce/order-svc:dev
environment: environment:
- APP_DOMAIN=order.api.egommerce.pbiernat.dev - APP_DOMAIN=order-svc
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
volumes: volumes:
- ./certs/api-gateway:/certs - ./certs/api-gateway:/certs
@ -119,27 +119,28 @@ services:
basket-worker: basket-worker:
image: git.pbiernat.dev/egommerce/basket-worker:dev image: git.pbiernat.dev/egommerce/basket-worker:dev
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
catalog-worker: catalog-worker:
image: git.pbiernat.dev/egommerce/catalog-worker:dev image: git.pbiernat.dev/egommerce/catalog-worker:dev
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
pricing-worker: pricing-worker:
image: git.pbiernat.dev/egommerce/pricing-worker:dev image: git.pbiernat.dev/egommerce/pricing-worker:dev
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672
order-worker: order-worker:
image: git.pbiernat.dev/egommerce/order-worker:dev image: git.pbiernat.dev/egommerce/order-worker:dev
environment: environment:
- DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce - DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
- MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017 - MONGODB_URL=mongodb://mongodb:12345678@mongo-db:27017
- EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672 - EVENTBUS_URL=amqp://guest:guest@api-eventbus:5672

View File

@ -61,42 +61,42 @@ services:
networks: networks:
- api-logger-network - api-logger-network
api-prometheus: #api-prometheus:
image: prom/prometheus:latest # FIXME: create private image(prod/dev)... # image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
user: root # user: root
environment: # environment:
- APP_NAME=api-prometheus # - APP_NAME=api-prometheus
- APP_DOMAIN # - APP_DOMAIN
volumes: # volumes:
- ./etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml # - ./etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
- /var/run/docker.sock:/var/run/docker.sock # - /var/run/docker.sock:/var/run/docker.sock
networks: # networks:
- api-prometheus-network # - api-prometheus-network
- api-grafana-network #- api-grafana-network
- api-gateway-network # - api-gateway-network
- api-registry-network # - api-registry-network
- api-eventbus-network # - api-eventbus-network
# - api-cache-network # - api-cache-network
# - api-logger-network # - api-logger-network
- basket-svc-network # - basket-svc-network
- basket-worker-network # - basket-worker-network
- catalog-svc-network # - catalog-svc-network
- catalog-worker-network # - catalog-worker-network
- identity-svc-network # - identity-svc-network
- order-svc-network # - order-svc-network
- order-worker-network # - order-worker-network
- pricing-svc-network # - pricing-svc-network
- pricing-worker-network # - pricing-worker-network
api-grafana: #api-grafana:
image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)... # image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
environment: # environment:
- APP_NAME=api-grafana # - APP_NAME=api-grafana
- APP_DOMAIN # - APP_DOMAIN
volumes: # volumes:
- grafana-db:/var/lib/grafana # - grafana-db:/var/lib/grafana
networks: # networks:
- api-grafana-network # - api-grafana-network
postgres-db: postgres-db:
image: postgres:14.1-alpine image: postgres:14.1-alpine
@ -161,6 +161,8 @@ services:
- ./db_migrations/basket-svc:/migrations - ./db_migrations/basket-svc:/migrations
networks: networks:
- basket-svc-network - basket-svc-network
- order-svc-network
- pricing-svc-network
- api-gateway-network - api-gateway-network
- api-registry-network - api-registry-network
- api-eventbus-network - api-eventbus-network
@ -305,65 +307,65 @@ volumes:
registry_data: ~ registry_data: ~
eventbus_data: ~ eventbus_data: ~
eventbus_logs: ~ eventbus_logs: ~
grafana-db: ~ #grafana-db: ~
networks: networks:
api-gateway-network: api-gateway-network:
driver: overlay driver: overlay
internal: true #internal: true
api-registry-network: api-registry-network:
driver: overlay driver: overlay
internal: true #internal: true
api-eventbus-network: api-eventbus-network:
driver: overlay driver: overlay
internal: true #internal: true
api-cache-network: api-cache-network:
driver: overlay driver: overlay
internal: true #internal: true
api-logger-network: api-logger-network:
driver: overlay driver: overlay
internal: true #internal: true
api-prometheus-network: api-prometheus-network:
driver: overlay driver: overlay
internal: true #internal: true
api-grafana-network: #api-grafana-network:
driver: overlay # driver: overlay
internal: true # internal: true
postgres-db-network: postgres-db-network:
driver: overlay driver: overlay
internal: true #internal: true
mongodb-db-network: mongodb-db-network:
driver: overlay driver: overlay
internal: true #internal: true
# api micro-services networks # api micro-services networks
identity-svc-network: identity-svc-network:
driver: overlay driver: overlay
internal: true #internal: true
basket-svc-network: basket-svc-network:
driver: overlay driver: overlay
internal: true #internal: true
catalog-svc-network: catalog-svc-network:
driver: overlay driver: overlay
internal: true #internal: true
pricing-svc-network: pricing-svc-network:
driver: overlay driver: overlay
internal: true #internal: true
order-svc-network: order-svc-network:
driver: overlay driver: overlay
internal: true #internal: true
# Workers networks # Workers networks
# identity-worker-network: # identity-worker-network:
@ -372,16 +374,17 @@ networks:
basket-worker-network: basket-worker-network:
driver: overlay driver: overlay
internal: true #internal: true
catalog-worker-network: catalog-worker-network:
driver: overlay driver: overlay
internal: true #internal: true
pricing-worker-network: pricing-worker-network:
driver: overlay driver: overlay
internal: true #internal: true
order-worker-network: order-worker-network:
driver: overlay driver: overlay
internal: true #internal: true