chore: updated compose cmd + added removing orphans services

Ayush7614 · Jul 24, 2022 · a014509 · a014509
1 parent 32362a5
commit a014509
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/operator/compose/01_api.yml b/operator/compose/01_api.yml
@@ -38,6 +38,11 @@ services:
     extends:
       file: api-common.yml
       service: common
+    environment:
+      - SIPPROXY_HOST
+      - SIPPROXY_API_PORT
+      - SIPPROXY_API_USERNAME
+      - SIPPROXY_API_SECRET     
     labels:
       - traefik.enable=true
       - traefik.http.routers.limiter.entrypoints=internal,websecure

diff --git a/operator/compose/basic-network.sh b/operator/compose/basic-network.sh
@@ -63,14 +63,14 @@ function basic_network() {
     fi
   done
 
-  COMPOSE_CMD="docker-compose --env-file .env ${COMPOSE_FILES[*]}"
+  COMPOSE_CMD="docker compose --env-file .env ${COMPOSE_FILES[*]}"
 
   case $1 in
   start)
-    eval "$COMPOSE_CMD -f letsencrypt.yml up -d"
+    eval "$COMPOSE_CMD -f letsencrypt.yml up -d --remove-orphans"
     ;;
   start-unsecure)
-    eval "$COMPOSE_CMD -f noencrypt.yml up -d"
+    eval "$COMPOSE_CMD -f noencrypt.yml up -d --remove-orphans"
     ;;
   stop | down)
     eval "$COMPOSE_CMD -f noencrypt.yml down"

diff --git a/operator/compose/env_example b/operator/compose/env_example
@@ -59,10 +59,10 @@ CONFIG=/opt/fonoster/config
 #RTPE_HOST=192.168.1.1
 
 # Domain for which to generate the certificate
-#LETSENCRYPT_DOMAIN=api.example.com
+LETSENCRYPT_DOMAIN=
 
 # E-Mail for receiving important account notifications (mandatory)
-#LETSENCRYPT_EMAIL=alice@acme.com
+LETSENCRYPT_EMAIL=
 
 # Whitelisted services (comma separated)
 AUTH_ACCESS_WHITELIST=/fonoster.auth.v1beta1.Auth/GetRole,/fonoster.users.v1beta1.Users/CreateUser,/fonoster.auth.v1beta1.Users/CreateUserCredentials
@@ -144,7 +144,7 @@ LOGS_LEVEL=info
 LOGS_TRANSPORT=fluent
 
 # Tracing
-TRACING_ENDINGPOINT=http://tracing:14268/api/traces
+TRACING_ENDPOINT=http://tracing:14268/api/traces
 
 #
 # Integration with secrets server (Vault)