diff --git a/Makefile b/Makefile index 8f24366..09e36ff 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ DEPLOY_DIR := ./deploy up: - - sh ${DEPLOY_DIR}/start-stack.sh + - sh ${DEPLOY_DIR}/start-docker.sh down: - docker stack rm egommerce diff --git a/deploy/docker/stack.yml b/deploy/docker/stack.yml index c6824ef..d2d11d5 100644 --- a/deploy/docker/stack.yml +++ b/deploy/docker/stack.yml @@ -104,13 +104,6 @@ services: - APP_DOMAIN - APP_NAME=api-eventbus - API_REGISTRY_ADDR=api-registry - # labels: - # - traefik.enable=true - # - traefik.tcp.routers.eventbus.tls=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 volumes: - eventbus_data:/var/lib/rabbitmq - eventbus_logs:/var/log/rabbitmq @@ -136,7 +129,7 @@ services: - APP_NAME=api-cache - API_REGISTRY_ADDR=api-registry volumes: - - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro + # - ../certs/ca/internalCA.crt:/usr/local/share/ca-certificates/internalCA.crt:ro - ../bin/register-service:/bin/register-service - ../bin/update-resolv.sh:/bin/update-resolv depends_on: diff --git a/deploy/start-docker.sh b/deploy/start-docker.sh index 24bd71a..7b9dbb6 100644 --- a/deploy/start-docker.sh +++ b/deploy/start-docker.sh @@ -2,10 +2,8 @@ # RUN IT FORM THE REPO ROOT DIR echo "Starting egommerce docker stack..." -docker stack deploy --with-registry-auth \ - --detach=false \ +docker stack deploy --with-registry-auth --detach=false \ --compose-file deploy/docker/stack.yml \ - --compose-file deploy/docker/stack.prod.yml \ --compose-file deploy/docker/stack.dev.yml \ --compose-file deploy/docker/stack.dev.local.yml \ egommerce diff --git a/deploy/start-stack.sh b/deploy/start-stack.sh deleted file mode 100644 index c739cb2..0000000 --- a/deploy/start-stack.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# RUN IT FORM THE REPO ROOT DIR - -echo "Starting egommerce stack..." -docker stack deploy --with-registry-auth \ - --compose-file deploy/egommerce-stack.yml \ - --compose-file deploy/egommerce-stack.dev.yml \ - --compose-file deploy/egommerce-stack.dev.local.yml \ - egommerce - -echo "Done."