AG-1592: externalize agora-api mongo port and db name, fix agora-apex…

… healthcheck, add missing agora-app env variables

apps/agora/api/.env.example

@@ -1,4 +1,6 @@
 MONGODB_PASS="changeme"
 MONGODB_USER="root"
 MONGODB_HOST="agora-mongo"
+MONGODB_PORT="27017"
+MONGODB_NAME="agora"
 NODE_ENV="development"

apps/agora/api/src/api.ts

@@ -17,6 +17,8 @@ import {
 const mongodbUser = process.env.MONGODB_USER;
 const mongodbPass = process.env.MONGODB_PASS;
 const mongodbHost = process.env.MONGODB_HOST;
+const mongodbPort = process.env.MONGODB_PORT;
+const mongodbName = process.env.MONGODB_NAME;
 
 if (!mongodbUser) {
   console.error('No MONGODB_USER environment variable has been defined.');
@@ -33,7 +35,17 @@ if (!mongodbHost) {
   process.exit(1);
 }
 
-const mongoUri = `mongodb://${mongodbUser}:${mongodbPass}@${mongodbHost}:27017/agora?authSource=admin`;
+if (!mongodbPort) {
+  console.error('No MONGODB_PORT environment variable has been defined.');
+  process.exit(1);
+}
+
+if (!mongodbName) {
+  console.error('No MONGODB_NAME environment variable has been defined.');
+  process.exit(1);
+}
+
+const mongoUri = `mongodb://${mongodbUser}:${mongodbPass}@${mongodbHost}:${mongodbPort}/${mongodbName}?authSource=admin`;
 
 mongoose
   .connect(mongoUri)

apps/agora/app/.env.example

@@ -1,4 +1,6 @@
 API_DOCS_URL="http://localhost:8000/api-docs"
 APP_VERSION="4.0.0"
 CSR_API_URL="http://localhost:8000/api/v1"
-SSR_API_URL="http://agora-api:3333/v1"
+SSR_API_URL="http://agora-api:3333/v1"
+ROLLBAR_TOKEN="e788198867474855a996485580b08d03"
+TAG_NAME="agora/v4.0.0-rc1"

docker/agora/services/apex.yml

@@ -12,7 +12,7 @@ services:
     ports:
       - '8000:80'
     healthcheck:
-      test: ['CMD', 'curl', '--fail', 'http://localhost:80/health']
+      test: ['CMD', 'wget', '--spider', '--quiet', 'http://localhost:80/health']
       interval: 30s
       timeout: 10s
       retries: 3