.gitignore

@@ -1,3 +1,3 @@
 .idea/
 
-#*.local.yml
+*.local.yml

Makefile

@@ -4,4 +4,4 @@ up:
 	- sh ${DEPLOY_DIR}/start-stack.sh
 
 down:
-	- docker stack rm egommerce
+	- docker stack egommerce

README.md

@@ -1,9 +1,3 @@
-# Egommerce docker stack
+# stack
 
-## RUNNING
+Egommerce docker stack
-
-# $ sh deploy/start-stack.sh
-
-## MAINTENANCE
-
-### If certificate doesn't work try to copy contents of the key file at the end of the cert file.

deploy/db_migrations/pricing-svc/0001_create_base_tables.down.sql

@@ -1 +0,0 @@
-DROP TABLE IF EXISTS pricing.price;

deploy/db_migrations/pricing-svc/0001_create_base_tables.up.sql

@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS pricing."price"
-(
-    id uuid NOT NULL DEFAULT gen_random_uuid()
-);
-
-ALTER TABLE IF EXISTS "pricing"."price"
-    OWNER to postgres;
-
--- TODO ^^ PRIVILEGES...

deploy/egommerce-stack.dev.local.yml

@@ -1,139 +0,0 @@
-version: "3.9"
-
-services:
-  api-gateway:
-    environment:
-      - APP_DOMAIN=egommerce.local
-    ports:
-      - '8443:443'
-      - '8888:8080'
-      - '5672:5672'
-  
-  api-registry:
-    command: ["-ui-content-path=/registry"]
-    environment:
-      - APP_DOMAIN=registry.egommerce.local
-    ports:
-      - '8500:8500'
-      # - '8600:8600'
-      # - '8600:8600/udp'
-
-  api-eventbus:
-    environment:
-      - APP_DOMAIN=eventbus.egommerce.local
-    labels:
-      - traefik.enable=true
-      - traefik.tcp.routers.eventbus.rule=HostSNI(`*`)
-      - traefik.tcp.routers.eventbus.entrypoints=rabbitmq
-      - traefik.tcp.routers.eventbus.service=eventbus
-      - traefik.tcp.services.eventbus.loadbalancer.server.port=5672
-    ports:
-      - '18084:8084'
-      - '15672:15672'
-  
-  api-cache:
-    environment:
-      - APP_DOMAIN=redis.egommerce.local
-    command: ["redis-server", "/etc/redis.conf", "--requirepass", "12345678"]
-    ports:
-      - '6379:6379'
-
-  api-logger:
-    environment:
-      - APP_DOMAIN=logger.egommerce.local
-    ports:
-      - '24224:24224'
-
-  # api-prometheus:
-  #   environment:
-  #     - APP_DOMAIN=prometheus.egommerce.local
-  #   ports:
-  #     - '9090:9090'
-
-  # api-grafana:
-  #   environment:
-  #     - APP_DOMAIN=grafana.egommerce.local
-  #   ports:
-  #     - '3000:3000'
-
-  postgres-db:
-    environment:
-      - APP_DOMAIN=postgres.egommerce.local
-    ports:
-      - '5432:5432'
-
-  mongo-db:
-    environment:
-      - APP_DOMAIN=mongo.egommerce.local
-    ports:
-      - '27017:27017'
-
-  identity-svc:
-    environment:
-      - APP_DOMAIN=identity.api.egommerce.local
-      - 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
-    ports:
-      - '8080:80'
-
-  basket-svc:
-    environment:
-      - APP_DOMAIN=basket.api.egommerce.local
-      - 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
-    ports:
-      - '8001:80'
-
-  catalog-svc:
-    environment:
-      - APP_DOMAIN=catalog.api.egommerce.local
-      - 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
-    ports:
-      - '8002:80'
-
-  order-svc:
-    environment:
-      - APP_DOMAIN=order.api.egommerce.local
-      - 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
-    ports:
-      - '8003:80'
-
-  pricing-svc:
-    environment:
-      - APP_DOMAIN=pricing.api.egommerce.local
-      - 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
-    ports:
-      - '8004:80'
-
-  # Workers (EventBus)
-  basket-worker:
-    environment:
-      - 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:
-    environment:
-      - 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:
-    environment:
-      - 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:
-    environment:
-      - 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

deploy/egommerce-stack.dev.yml

@@ -1,8 +1,10 @@
 version: "3.9"
 
 services:
+  # INFRASTRUCTURE SERVICES
   api-gateway:
     image: git.pbiernat.dev/egommerce/api-gateway:dev
+    hostname: api-gateway
     environment:
       - APP_DOMAIN=api-gateway
     volumes:
@@ -10,12 +12,14 @@ services:
 
   api-registry:
     image: git.pbiernat.dev/egommerce/api-registry:dev
+    hostname: api-registry
     environment:
       - APP_DOMAIN=api-registry
       - CONSUL_HTTP_TOKEN=devop
 
   api-eventbus:
     image: git.pbiernat.dev/egommerce/api-eventbus:dev
+    hostname: api-eventbus
     environment:
       - APP_DOMAIN=api-eventbus
       # - RABBITMQ_NODENAME=api-eventbus
@@ -30,20 +34,24 @@ services:
 
   api-logger:
     image: git.pbiernat.dev/egommerce/api-logger:dev
+    hostname: api-logger
     environment:
       - APP_DOMAIN=api-logger
 
   #api-prometheus:
     # image: prom/prometheus:latest # FIXME: create private image(prod/dev)...
+  #  hostname: prometheus.keshop.bieda.it
   #  environment:
   #    - APP_DOMAIN=prometheus.keshop.bieda.it
 
   #api-grafana:
     # image: grafana/grafana-oss:latest # FIXME: create private image(prod/dev)...
+  #  hostname: grafana.keshop.bieda.it
   #  environment:
   #    - APP_DOMAIN=grafana.keshop.bieda.it
 
   postgres-db:
+    hostname: postgres-db
     environment:
       - APP_DOMAIN=postgres-db
       - POSTGRES_PASSWORD=12345678
@@ -51,8 +59,9 @@ services:
     #   - '5432:5432'
 
   mongo-db:
+    hostname: mongodb.keshop.bieda.it
     environment:
-      - APP_DOMAIN=mongo-db
+      - APP_DOMAIN=mongodb-db
       - MONGO_INITDB_ROOT_PASSWORD=12345678
 
   # API micro-services
@@ -70,7 +79,6 @@ services:
     image: git.pbiernat.dev/egommerce/basket-svc:dev
     environment:
       - APP_DOMAIN=basket-svc
-      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - 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
@@ -81,7 +89,6 @@ services:
     image: git.pbiernat.dev/egommerce/catalog-svc:dev
     environment:
       - APP_DOMAIN=catalog-svc
-      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - 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
@@ -92,7 +99,6 @@ services:
     image: git.pbiernat.dev/egommerce/pricing-svc:dev
     environment:
       - APP_DOMAIN=pricing-svc
-      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - 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
@@ -103,14 +109,13 @@ services:
     image: git.pbiernat.dev/egommerce/order-svc:dev
     environment:
       - APP_DOMAIN=order-svc
-      - AUTH_HANDLER_URL=http://identity-svc/api/v1/traefik
       - 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
 
-  # Workers (Eventbus)
+  # Workers (EventBus)
   basket-worker:
     image: git.pbiernat.dev/egommerce/basket-worker:dev
     environment:

deploy/egommerce-stack.yml

@@ -154,7 +154,6 @@ services:
       - APP_PATH_PREFIX=/basket
       - APP_DOMAIN
       - APP_KV_NAMESPACE
-      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -178,7 +177,6 @@ services:
       - APP_PATH_PREFIX=/catalog
       - APP_DOMAIN
       - APP_KV_NAMESPACE
-      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -200,7 +198,6 @@ services:
       - APP_PATH_PREFIX=/pricing
       - APP_DOMAIN
       - APP_KV_NAMESPACE
-      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -222,7 +219,6 @@ services:
       - APP_PATH_PREFIX=/order
       - APP_DOMAIN
       - APP_KV_NAMESPACE
-      - AUTH_HANDLER_URL
       - DATABASE_URL
       - MONGODB_URL
       - EVENTBUS_URL
@@ -237,7 +233,7 @@ services:
       - postgres-db-network
       - mongodb-db-network
 
-  # Workers (Eventbus)
+  # Workers (EventBus)
   basket-worker:
     image: git.pbiernat.dev/egommerce/basket-worker:latest
     environment:
@@ -248,7 +244,7 @@ services:
       - EVENTBUS_URL
     networks:
       - basket-worker-network
-      - pricing-svc-network
+      # - pricing-svc-network
       - api-gateway-network
       - api-registry-network
       - api-eventbus-network