refactor: tweak compose for console

.env.template

@@ -3,6 +3,7 @@ MPS_COMMON_NAME=localhost
 MPSPORT=4433
 
 # Console
+# openssl rand -hex 16
 APP_ENCRYPTION_KEY=
 LOG_LEVEL=info
 HTTP_PORT=8181
@@ -13,6 +14,7 @@ AUTH_ADMIN_USERNAME=standalone
 AUTH_ADMIN_PASSWORD=
 AUTH_JWT_KEY=
 AUTH_JWT_EXPIRATION=24h
+AUTH_ISSUER=console
 
 # RPS
 RPSWEBPORT=8081

docker-compose.yml

@@ -12,43 +12,51 @@ services:
       context: ./services/console
       dockerfile: ./Dockerfile
     networks:
-      - openamtnetwork
+      - dmtnetwork
     env_file:
       - .env
     environment:
+      GIN_MODE: release
+      HEADLESS: "true"
       APP_COMMON_NAME: ${MPS_COMMON_NAME}
+      DB_PROVIDER: postgres
       DB_URL: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/rpsdb
-      SECRET_ADDR: http://vault:8200
-      SECRET_TOKEN: ${VAULT_TOKEN}
+      SECRETS_ADDR: http://vault:8200
+      SECRETS_TOKEN: ${VAULT_TOKEN}
+      SECRETS_PATH: ${SECRETS_PATH}
+      HTTP_HOST: "0.0.0.0"
       HTTP_PORT: "8181"
-      LOG_LEVEL: info
+      HTTP_TLS_ENABLED: "false"
+      LOG_LEVEL: ${LOG_LEVEL}
+      APP_DISABLE_CIRA: "false"
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://localhost:8181/api/v1/health"]
+      test: ["CMD", "/app", "--health"]
       interval: 12s
       timeout: 12s
       retries: 3
-    ports:
-      - "8181:8181"
-      - "${MPSPORT}:4433"
+    expose:
+      - "8181"
+      - "4433"
 
   webui:
     restart: always
     image: intel/oact-webui:latest
     networks:
-      - openamtnetwork
+      - dmtnetwork
     build:
       context: ./services/sample-web-ui
       dockerfile: ./Dockerfile
+      args:
+        BUILD_CONFIGURATION: enterprise
     environment:
-      RPS_SERVER: https://${MPS_COMMON_NAME}/rps
-      MPS_SERVER: https://${MPS_COMMON_NAME}/mps
+      CONSOLE_SERVER_API: https://${MPS_COMMON_NAME}
       VAULT_SERVER: https://${MPS_COMMON_NAME}/vault
 
   rps:
     restart: always
     image: intel/oact-rps:latest
     networks:
-      - openamtnetwork
+      - dmtnetwork
     build:
       context: ./services/rps
       dockerfile: ./Dockerfile
@@ -69,23 +77,6 @@ services:
       RPS_CONSUL_HOST: ${CONSUL_HOST}
       RPS_CONSUL_PORT: ${CONSUL_PORT}
 
-  mpsrouter:
-    restart: always
-    image: intel/oact-mpsrouter:latest
-    build:
-      context: ./services/mps-router
-      dockerfile: ./Dockerfile
-    networks:
-      - openamtnetwork
-    environment:
-      MPS_CONNECTION_STRING: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/rpsdb?sslmode=disable
-      PORT: ${PORT}
-      MPS_PORT: ${MPSWEBPORT}
-    healthcheck:
-      interval: 12s
-      timeout: 12s
-      retries: 3
-      test: ["CMD", "/app", "--health"]
 
   db:
     restart: always
@@ -94,7 +85,7 @@ services:
       context: ./pg
       dockerfile: ./Dockerfile
     networks:
-      - openamtnetwork
+      - dmtnetwork
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d rpsdb"]
       interval: 2s
@@ -106,14 +97,13 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
       - 5432:5432
-    volumes:
-      - ./data:/docker-entrypoint-initdb.d
+
 
   vault:
     restart: always
     image: hashicorp/vault:1.21
     networks:
-      - openamtnetwork
+      - dmtnetwork
     ports:
       - 8200:8200
     environment:
@@ -131,34 +121,37 @@ services:
       timeout: 10s
       retries: 10
     command:
-      - "kong"
-      - "start"
-      - "--vv"
+      - sh
+      - -c
+      - 'awk -v k="$$AUTH_JWT_KEY" ''{gsub(/\$\{AUTH_JWT_KEY\}/, k); print}'' /home/kong/kong.yml.tpl > /tmp/kong.yml && exec kong start --vv'
     environment:
       - KONG_DATABASE=off
       - KONG_CASSANDRA_CONTACT_POINTS=kong-database
       - KONG_ADMIN_LISTEN=0.0.0.0:8001
       - KONG_ADMIN_LISTEN_SSL=0.0.0.0:8444
       - KONG_NGINX_DAEMON=off
-      - KONG_DECLARATIVE_CONFIG=/home/kong/kong.yml
+      - KONG_DECLARATIVE_CONFIG=/tmp/kong.yml
       - KONG_PROXY_ERROR_LOG=/dev/stderr
       - KONG_PROXY_ACCESS_LOG=/dev/stdout
       - KONG_ADMIN_ACCESS_LOG=/dev/stdout
       - KONG_ADMIN_ERROR_LOG=/dev/stderr
       - KONG_DNS_ORDER=LAST,A,CNAME
       - KONG_UPSTREAM_KEEPALIVE_POOL_SIZE=0
+      - KONG_STREAM_LISTEN=0.0.0.0:4433
+      - AUTH_JWT_KEY=${AUTH_JWT_KEY}
     networks:
-      - openamtnetwork
+      - dmtnetwork
     volumes:
-      - ./kong.yaml:/home/kong/kong.yml
+      - ./kong.yaml:/home/kong/kong.yml.tpl
     ports:
       - 443:8443
       - 8001:8001
+      - "${MPSPORT}:4433"
 
 volumes:
   app-volume:
   private-volume:
 
 networks:
-  openamtnetwork:
+  dmtnetwork:
     driver: "bridge"