[FIX] config client

.env-client.template

@@ -1,13 +1,13 @@
 APP_NAME="Service Demo"
 APP_DESC="Service Desc"
 APP_VERSION="1.0.4"
-SERVICE_URL="http://backend:8225"
 THEME="italia"
 SERVER_DATETIME_MASK="%Y-%m-%dT%H:%M:%S"
 SERVER_DATE_MASK="%Y-%m-%d"
 UI_DATETIME_MASK="%d/%m/%Y %H:%M"
 UI_DATE_MASK="%d/%m/%Y"
 TZ="Europe/Rome"
+SERVICE_URL="http://backend:8225"
 BASE_URL="http://localhost:8526"
 LOGO_IMG_URL="https://www.inrim.eu/sites/all/themes/inrimbootstrap/logo.png"
 REPORT_FOOTER_COMPANY="Your Name"

.env.template

@@ -12,11 +12,6 @@ JWT_EXPIRE_MINUTE=0
 SERVICE_HEADER_KEY=""
 SERVICE_URL=""
 SERVICE_KEY=""
-MONGO_URL=""
-MONGO_USER=""
-MONGO_PASS=""
-MONGO_DB=""
-MONGO_REPLICA=""
 SERVER_DATETIME_MASK="%Y-%m-%d %H:%M"
 SERVER_DATE_MASK="%Y-%m-%d"
 UI_DATETIME_MASK="%d/%m/%Y %H:%M"
@@ -32,10 +27,11 @@ LDAP_URL=""
 LDAP_NAME=""
 LDAP_BIND_DN=""
 LDAP_BASE_DN=""
-MONGO_INITDB_DATABASE=
-MONGO_INITDB_ROOT_USERNAME=
-MONGO_INITDB_ROOT_PASSWORD=
-ADMIN_USERNAME=
-ADMIN_PASSWORD=
+MONGO_DB=
+MONGO_URL=""
+MONGO_USER=""
+MONGO_PASS=""
+MONGO_DB=""
+MONGO_REPLICA=""
 ADMINS=[]
 PLUGINS=[]

.env.template.demo

@@ -12,11 +12,6 @@ JWT_EXPIRE_MINUTE=0
 SERVICE_HEADER_KEY=""
 SERVICE_URL=""
 SERVICE_KEY=""
-MONGO_URL="databse:27017"
-MONGO_USER="test"
-MONGO_PASS="test"
-MONGO_DB="test_app"
-MONGO_REPLICA=""
 SERVER_DATETIME_MASK="%Y-%m-%d %H:%M"
 SERVER_DATE_MASK="%Y-%m-%d"
 UI_DATETIME_MASK="%d/%m/%Y %H:%M"
@@ -28,9 +23,11 @@ SESSION_EXPIRE_HOURS=12
 DEFAULT_COMPONENT_FOLDER='/app/ozon/core/asset_default/form_component'
 TZ="Europe/Rome"
 DEMO=1
-MONGO_INITDB_DATABASE=test_app
-MONGO_INITDB_ROOT_USERNAME=test
-MONGO_INITDB_ROOT_PASSWORD=test
+MONGO_URL="databse:27017"
+MONGO_DB=test_app
+MONGO_USER=test
+MONGO_PASS=test
+MONGO_REPLICA=""
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=admin
 WEB_CONCURRENCY=3

build_and_run.sh

@@ -14,16 +14,16 @@ if [ -z "${STACK}" ]; then
    export STACK="service-app"
 fi
 echo "setup mongo"
-if [ -z "${MONGO_INITDB_DATABASE}" ]; then
-   echo "MONGO_INITDB_DATABASE env var not set and required!"
+if [ -z "${MONGO_DB}" ]; then
+   echo "MONGO_DB env var not set and required!"
    exit 0
 fi
-if [ -z "${MONGO_INITDB_ROOT_USERNAME}" ]; then
-   echo "MONGO_INITDB_ROOT_USERNAME env var not set and required!"
+if [ -z "${MONGO_USER}" ]; then
+   echo "MONGO_USER env var not set and required!"
    exit 0
 fi
-if [ -z "${MONGO_INITDB_ROOT_PASSWORD}" ]; then
-   echo "MONGO_INITDB_ROOT_PASSWORD env var not set and required!"
+if [ -z "${MONGO_PASS}" ]; then
+   echo "MONGO_PASS env var not set and required!"
    exit 0
 fi
 if [ -z "${ADMIN_USERNAME}" ]; then

build_and_run_dev.sh

@@ -14,16 +14,16 @@ if [ -z "${STACK}" ]; then
    export STACK="service-app"
 fi
 echo "setup mongo"
-if [ -z "${MONGO_INITDB_DATABASE}" ]; then
-   echo "MONGO_INITDB_DATABASE env var not set and required!"
+if [ -z "${MONGO_DB}" ]; then
+   echo "MONGO_DB env var not set and required!"
    exit 0
 fi
-if [ -z "${MONGO_INITDB_ROOT_USERNAME}" ]; then
-   echo "MONGO_INITDB_ROOT_USERNAME env var not set and required!"
+if [ -z "${MONGO_USER}" ]; then
+   echo "MONGO_USER env var not set and required!"
    exit 0
 fi
-if [ -z "${MONGO_INITDB_ROOT_PASSWORD}" ]; then
-   echo "MONGO_INITDB_ROOT_PASSWORD env var not set and required!"
+if [ -z "${MONGO_PASS}" ]; then
+   echo "MONGO_PASS env var not set and required!"
    exit 0
 fi
 if [ -z "${ADMIN_USERNAME}" ]; then

docker-compose.yml

@@ -12,9 +12,9 @@ services:
       args:
         TZ: $TZ
     environment:
-      MONGO_INITDB_ROOT_USERNAME: $MONGO_INITDB_ROOT_USERNAME
-      MONGO_INITDB_ROOT_PASSWORD: $MONGO_INITDB_ROOT_PASSWORD
-      MONGO_INITDB_DATABASE: $MONGO_INITDB_DATABASE
+      MONGO_USER: $MONGO_USER
+      MONGO_PASS: $MONGO_PASS
+      MONGO_DB: $MONGO_DB
     volumes:
       - ./mdbdata:/data/db
       - ./scripts/init_db.js:/docker-entrypoint-initdb.d/init_db.js:ro

setup_db.sh

@@ -1,8 +1,8 @@
 source .env
 DATA='
 db.createUser({
-  user: "'$MONGO_INITDB_ROOT_USERNAME'",
-  pwd:  "'$MONGO_INITDB_ROOT_PASSWORD'",
-  roles: [ { role: "readWrite", db: "'$MONGO_INITDB_DATABASE'" } ]
+  user: "'$MONGO_USER'",
+  pwd:  "'$MONGO_PASS'",
+  roles: [ { role: "readWrite", db: "'$MONGO_DB'" } ]
 });'
 echo "${DATA}" > scripts/init_db.js