egommerce/stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Piotr Biernat
2024-12-24 14:19:23 +01:00
parent 35dd2d38bf
commit a856f24132
22 changed files with 445 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
deploy/docker/stack.yml
View File

@@ -2,7 +2,7 @@ version: "3.9"
services:
api-registry:
image: git.pbiernat.io/egommerce/api-registry:latest
image: git.ego.cloudns.be/egommerce/api-registry:latest
command: [
"consul",
"agent",
@@ -19,13 +19,15 @@ services:
- CONSUL_CACERT=/usr/share/pki/ca-trust-source/anchors/internalCA.crt
- CONSUL_CLIENT_CERT=/etc/certs/registry.crt
- CONSUL_CLIENT_KEY=/etc/certs/registry.key
- VAULT_ADDR=https://api-vault:8200
# - VAULT_API_ADDR=https://api-vault:8200
volumes:
- registry_data:/consul/data
- ../certs/api-registry/registry.internal.crt:/etc/certs/registry.crt:ro
- ../certs/api-registry/registry.key:/etc/certs/registry.key:ro
- ../certs/ca/internalCA.crt:/usr/share/pki/ca-trust-source/anchors/internalCA.crt:ro
# - ../bin/register-service:/bin/register-service
# - ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/api-registry/api-registry.crt:/etc/certs/registry.crt:ro
- ../certs/api-registry/api-registry.key:/etc/certs/registry.key:ro
- ../certs/ca-root/ca-root.crt:/usr/share/pki/ca-trust-source/anchors/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
# - ../bin/update-resolv:/bin/update-resolv
deploy:
mode: replicated
replicas: 1
@@ -35,7 +37,7 @@ services:
- egommerce-network
api-gateway: # consul client running as api-gateway
image: git.pbiernat.io/egommerce/api-registry:latest
image: git.ego.cloudns.be/egommerce/api-registry:latest
command: [
"consul",
"agent",
@@ -54,15 +56,17 @@ services:
- CONSUL_CACERT=/usr/share/pki/ca-trust-source/anchors/internalCA.crt
- CONSUL_CLIENT_CERT=/etc/certs/gateway.crt
- CONSUL_CLIENT_KEY=/etc/certs/gateway.key
- VAULT_ADDR=https://api-vault:8200
# - VAULT_API_ADDR=https://api-vault:8200
volumes:
- gateway_data:/consul/data
- ../certs/api-gateway/gateway.internal.crt:/etc/certs/gateway.crt:ro
- ../certs/api-gateway/gateway.key:/etc/certs/gateway.key:ro
- ../certs/api-gateway/api-gateway.crt:/etc/certs/gateway.crt:ro
- ../certs/api-gateway/api-gateway.key:/etc/certs/gateway.key:ro
- ../certs/catalog-svc/catalog-svc.crt:/etc/certs/catalog.crt:ro
- ../certs/catalog-svc/catalog-svc.key:/etc/certs/catalog.key:ro
- ../certs/ca/internalCA.crt:/usr/share/pki/ca-trust-source/anchors/internalCA.crt:ro
# - ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/ca-root/ca-root.crt:/usr/share/pki/ca-trust-source/anchors/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -74,19 +78,21 @@ services:
- egommerce-network
api-vault:
image: git.pbiernat.io/egommerce/api-vault:latest
image: git.ego.cloudns.be/egommerce/api-vault:latest
command: ["vault", "server", "-config=/vault/config/server.hcl"]
environment:
- APP_DOMAIN
- APP_NAME=api-vault
- API_REGISTRY_ADDR=api-registry
- VAULT_ADDR=https://localhost:8200
- VAULT_API_ADDR=https://localhost:8200
volumes:
- vault_data:/vault/data
- ../certs/api-vault/vault.internal.crt:/etc/certs/vault.crt:ro
- ../certs/api-vault/vault.key:/etc/certs/vault.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/api-vault/api-vault.crt:/etc/certs/vault.crt:ro
- ../certs/api-vault/api-vault.key:/etc/certs/vault.key:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
cap_add:
@@ -97,7 +103,7 @@ services:
# - IPC_LOCK
api-eventbus:
image: git.pbiernat.io/egommerce/api-eventbus:latest
image: git.ego.cloudns.be/egommerce/api-eventbus:latest
environment:
# - RABBITMQ_NODENAME=api-eventbus
- RABBITMQ_ERLANG_COOKIE=rabbitmq
@@ -107,11 +113,11 @@ services:
volumes:
- eventbus_data:/var/lib/rabbitmq
- eventbus_logs:/var/log/rabbitmq
- ../certs/api-eventbus/eventbus.internal.crt:/etc/certs/eventbus.crt:ro
- ../certs/api-eventbus/eventbus.key:/etc/certs/eventbus.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/api-eventbus/api-eventbus.crt:/etc/certs/eventbus.crt:ro
- ../certs/api-eventbus/api-eventbus.key:/etc/certs/eventbus.key:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -123,15 +129,15 @@ services:
- egommerce-network
api-cache:
image: git.pbiernat.io/egommerce/api-cache:latest
image: git.ego.cloudns.be/egommerce/api-cache:latest
environment:
- APP_DOMAIN
- APP_NAME=api-cache
- API_REGISTRY_ADDR=api-registry
volumes:
# - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -143,15 +149,15 @@ services:
- egommerce-network
api-logger:
image: git.pbiernat.io/egommerce/api-logger:latest
image: git.ego.cloudns.be/egommerce/api-logger:latest
environment:
- APP_DOMAIN
- APP_NAME=api-logger
- API_REGISTRY_ADDR=api-registry
volumes:
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -171,9 +177,9 @@ services:
# - API_REGISTRY_ADDR=api-registry
# volumes:
# - ../etc/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
# - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../bin/register-service:/bin/register-service
# - ../bin/update-resolv.sh:/bin/update-resolv
# - ../bin/update-resolv:/bin/update-resolv
# - /var/run/docker.sock:/var/run/docker.sock
# depends_on:
# - api-registry
@@ -188,8 +194,8 @@ services:
# - API_REGISTRY_ADDR=api-registry
# volumes:
# - grafana-db:/var/lib/grafana
# - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../bin/update-resolv.sh:/bin/update-resolv
# - ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../bin/update-resolv:/bin/update-resolv
# - ../bin/register-service:/bin/register-service
# depends_on:
# - api-registry
@@ -197,7 +203,7 @@ services:
# - egommerce-network
db-postgres:
image: git.pbiernat.io/egommerce/db-postgres:latest
image: git.ego.cloudns.be/egommerce/db-postgres:latest
environment:
- APP_DOMAIN
- APP_NAME=db-postgres
@@ -208,9 +214,9 @@ services:
volumes:
- postgres_data:/var/lib/postgresql/data
# - ./db_migrations/init/:/docker-entrypoint-initdb.d/
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -231,9 +237,9 @@ services:
# - MONGO_INITDB_ROOT_PASSWORD
# volumes:
# - mongodb_data:/data/db
# - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
# - ../bin/register-service:/bin/register-service
# - ../bin/update-resolv.sh:/bin/update-resolv
# - ../bin/update-resolv:/bin/update-resolv
# depends_on:
# - api-registry
# deploy:
@@ -246,7 +252,7 @@ services:
# API micro-services
identity-svc:
image: git.pbiernat.io/egommerce/identity-svc:latest
image: git.ego.cloudns.be/egommerce/identity-svc:latest
environment:
- APP_NAME=identity-svc
- APP_PATH_PREFIX=/identity
@@ -259,10 +265,10 @@ services:
volumes:
- ../certs/identity-svc/identity-svc.crt:/certs/client.crt:ro
- ../certs/identity-svc/identity-svc.key:/certs/client.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../db_migrations/identity-svc:/migrations
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -274,7 +280,7 @@ services:
- egommerce-network
catalog-svc:
image: git.pbiernat.io/egommerce/catalog-svc:latest
image: git.ego.cloudns.be/egommerce/catalog-svc:latest
environment:
- APP_NAME=catalog-svc
- APP_PATH_PREFIX=/catalog
@@ -288,10 +294,10 @@ services:
volumes:
- ../certs/catalog-svc/catalog-svc.crt:/certs/client.crt:ro
- ../certs/catalog-svc/catalog-svc.key:/certs/client.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../db_migrations/catalog-svc:/migrations
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -303,7 +309,7 @@ services:
- egommerce-network
basket-svc:
image: git.pbiernat.io/egommerce/basket-svc:latest
image: git.ego.cloudns.be/egommerce/basket-svc:latest
environment:
- APP_NAME=basket-svc
- APP_PATH_PREFIX=/basket
@@ -317,10 +323,10 @@ services:
volumes:
- ../certs/basket-svc/basket-svc.crt:/certs/client.crt:ro
- ../certs/basket-svc/basket-svc.key:/certs/client.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../db_migrations/basket-svc:/migrations
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -332,7 +338,7 @@ services:
- egommerce-network
order-svc:
image: git.pbiernat.io/egommerce/order-svc:latest
image: git.ego.cloudns.be/egommerce/order-svc:latest
environment:
- APP_NAME=order-svc
- APP_PATH_PREFIX=/order
@@ -346,10 +352,10 @@ services:
volumes:
- ../certs/order-svc/order-svc.crt:/certs/client.crt:ro
- ../certs/order-svc/order-svc.key:/certs/client.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../db_migrations/order-svc:/migrations
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -361,7 +367,7 @@ services:
- egommerce-network
pricing-svc:
image: git.pbiernat.io/egommerce/pricing-svc:latest
image: git.ego.cloudns.be/egommerce/pricing-svc:latest
environment:
- APP_NAME=pricing-svc
- APP_PATH_PREFIX=/pricing
@@ -375,10 +381,10 @@ services:
volumes:
- ../certs/pricing-svc/pricing-svc.crt:/certs/client.crt:ro
- ../certs/pricing-svc/pricing-svc.key:/certs/client.key:ro
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../db_migrations/pricing-svc:/migrations
- ../bin/register-service:/bin/register-service
- ../bin/update-resolv.sh:/bin/update-resolv
- ../bin/update-resolv:/bin/update-resolv
depends_on:
- api-registry
deploy:
@@ -391,7 +397,7 @@ services:
# Workers (Eventbus)
basket-worker:
image: git.pbiernat.io/egommerce/basket-worker:latest
image: git.ego.cloudns.be/egommerce/basket-worker:latest
environment:
- APP_NAME=basket-worker
- APP_KV_NAMESPACE
@@ -399,8 +405,8 @@ services:
- MONGODB_URL
- EVENTBUS_URL
volumes:
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv:/bin/update-resolv
deploy:
mode: replicated
replicas: 1
@@ -410,15 +416,15 @@ services:
- egommerce-network
catalog-worker:
image: git.pbiernat.io/egommerce/catalog-worker:latest
image: git.ego.cloudns.be/egommerce/catalog-worker:latest
environment:
- APP_NAME=catalog-worker
- DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL
volumes:
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv:/bin/update-resolv
deploy:
mode: replicated
replicas: 1
@@ -428,15 +434,15 @@ services:
- egommerce-network
pricing-worker:
image: git.pbiernat.io/egommerce/pricing-worker:latest
image: git.ego.cloudns.be/egommerce/pricing-worker:latest
environment:
- APP_NAME=pricing-worker
- DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL
volumes:
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv:/bin/update-resolv
deploy:
mode: replicated
replicas: 1
@@ -446,15 +452,15 @@ services:
- egommerce-network
order-worker:
image: git.pbiernat.io/egommerce/order-worker:latest
image: git.ego.cloudns.be/egommerce/order-worker:latest
environment:
- APP_NAME=order-worker
- DATABASE_URL
- MONGODB_URL
- EVENTBUS_URL
volumes:
- ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv.sh:/bin/update-resolv
- ../certs/ca-root/ca-root.crt:/usr/local/share/ca-certificates/internalCA.crt:ro
- ../bin/update-resolv:/bin/update-resolv
deploy:
mode: replicated
replicas: 1