Finish release/1.4.1

Release/1.4.1

Author: dragos-dobre

.env.example

@@ -7,23 +7,38 @@ DB_NAME=IMIS
 ACCEPT_EULA= <y if you accept MS EULA >
 
 # urls
-NEW_OPENIMIS_HOST=demo.openimis.org # url of openimis
-GATEWAY_PORT=80 # http port for openimis
-GATEWAY_PORT_S=443 # https port for openimis
+# url of openimis
+NEW_OPENIMIS_HOST=demo.openimis.org
+# http port for openimis
+GATEWAY_PORT=80
+# https port for openimis
+GATEWAY_PORT_S=443
 
 # github branches to use
-DB_BRANCH=main # branch to get the code of database
-GW_BRANCH=main # branch to get the code of gateway
-BE_BRANCH=main # branch to get the code of BE assembly
-FE_BRANCH=main # branch to get the code of FE assembly
-RESTAPI_BRANCH=main # branch to get the code of the restapi
+# Database
+DB_BRANCH=main
+#Gate way
+GW_BRANCH=main
+# BE assembly
+BE_BRANCH=main
+#FE assembly
+FE_BRANCH=main
+# REST API
+RESTAPI_BRANCH=main
+# branch to get the code of the restapi
 
 # build flavours
-RESTAPI_BUILD_FLAVOR=Release # rest API flavours
+# rest API flavours
+RESTAPI_BUILD_FLAVOR=Release
 
 # docker-compose parameters
-PROJECT_NAME=demo # docker compose project name
-IP_SUB=20 # to use in case there is multiple openimis, the container have fixed IP address to avoid issue when a container is recreated: then it could change ip and the gateway woin't find it anymore (limitation of free nginx) 
+# docker compose project name
+PROJECT_NAME=demo
+# to use in case there is multiple openimis, the container have fixed IP address to avoid issue when a container is recreated: then it could change ip and the gateway woin't find it anymore (limitation of free nginx) 
+IP_SUB=20
 
-#OPENIMIS_BE_CONF_JSON= one-liner json config for the BE (to overright the openimis.json from the BE assembly)
-#OPENIMIS_FE_CONF_JSON= one-liner json config for the FE (to overright the openimis.json from the FE assembly)
+#one-liner json config for the BE (to overright the openimis.json from the BE assembly)
+#OPENIMIS_BE_CONF_JSON= 
+
+#one-liner json config for the FE (to overright the openimis.json from the FE assembly)
+#OPENIMIS_FE_CONF_JSON= 

conf/restapi/appsettings.Production.json

@@ -1,6 +1,6 @@
 {
     "ConnectionStrings": {
-            "IMISDatabase": "server=db;Database=IMIS;User ID=IMISuser;Password=IMISuser@1234"
+        "IMISDatabase": "server=db;Database=IMIS;User ID=IMISuser;Password=IMISuser@1234"
     },
     "Log4NetCore": {
         "PropertyOverrides": [

conf/restapi/appsettings.json

@@ -21,20 +21,20 @@
         },
         "AppPrefixDir":  "/rest",
         "AppSettings": {
-                "FromPhone_Renewal": "\\log\\FromPhone\\Renewal\\",
-                "FromPhone_Renewal_Rejected": "\\log\\FromPhone\\Renewal\\Rejected\\",
-                "FromPhone_Claim": "\\log\\FromPhone\\Claim\\",
-                "FromPhone_Claim_Rejected": "\\log\\FromPhone\\Claim\\Rejected\\",
-                "FromPhone_Feedback": "\\log\\FromPhone\\Feedback\\",
-                "FromPhone_Feedback_Rejected": "\\log\\FromPhone\\Feedback\\Rejected\\",
-                "Extracts_Phone": "\\log\\Extracts\\Phone\\",
-                "Enrollment_Phone": "\\log\\FromPhone\\Enrollment\\",
-                "Extracts_Offline": "\\log\\Extracts\\Offline\\",
-                "JsonDebugFolder": "\\log\\FromPhone\\Enrollment\\Debug\\",
-                "SmsStrings": "\\log\\Escape\\Sms\\Strings\\",
-                "SmsStringsSecondary": "\\log\\Escape\\Sms\\StringsSecondaryLanguage\\",
-                "SubmittedFolder": "\\Photos\\Submitted\\",
-                "UpdatedFolder": "\\Photos\\"
+                "FromPhone_Renewal": "/log/FromPhone/Renewal/",
+                "FromPhone_Renewal_Rejected": "/log/FromPhone/Renewal/Rejected/",
+                "FromPhone_Claim": "/log/FromPhone/Claim/",
+                "FromPhone_Claim_Rejected": "/log/FromPhone/Claim/Rejected/",
+                "FromPhone_Feedback": "/log/FromPhone/Feedback/",
+                "FromPhone_Feedback_Rejected": "/log/FromPhone/Feedback/Rejected/",
+                "Extracts_Phone": "/log/Extracts/Phone/",
+                "Enrollment_Phone": "/log/FromPhone/Enrollment/",
+                "Extracts_Offline": "/log/Extracts/Offline/",
+                "JsonDebugFolder": "/log/FromPhone/Enrollment/Debug/",
+                "SmsStrings": "/log/Escape/Sms/Strings/",
+                "SmsStringsSecondary": "/log/Escape/Sms/StringsSecondaryLanguage/",
+                "SubmittedFolder": "/app/photos/Submitted/",
+                "UpdatedFolder": "/app/photos/"
         },
         "SmsGateWay": null,
         "Defaults": {

docker-compose.yml

@@ -49,6 +49,7 @@ services:
       - SITE_ROOT=api
       - SITE_URL=${NEW_OPENIMIS_HOST}
       - CELERY_BROKER_URL=amqp://rabbitmq
+      - PHOTO_ROOT_PATH=images/insurees
     depends_on:  
       db:
         condition: service_healthy
@@ -116,6 +117,8 @@ services:
       context:  https://github.com/openimis/rest_api_c-sharp.git#${RESTAPI_BRANCH:-develop}
       args:
         BUILD-FLAVOUR: ${RESTAPI_BUILD_FLAVOUR:-Release}
+    environment:
+        - ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:80}
     volumes:
       - ./conf/restapi:/app/config
       - logs:/app/log