Merge branch 'master' into PLAT-707-kafka-integration

Author: nour-borgi

Dockerfile

@@ -17,3 +17,9 @@ FROM nginx:mainline-alpine
 WORKDIR /usr/share/nginx/html
 
 COPY --from=build /app/dist  ./
+
+COPY ./docker-entrypoint.sh /usr/local/bin/
+
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+ENTRYPOINT [ "/bin/sh", "/usr/local/bin/docker-entrypoint.sh" ]

app/config/default-env.json

@@ -0,0 +1,19 @@
+{
+  "version": "1.14.4",
+  "minimumCoreVersion": "5.2.0",
+  "protocol": "${OPENHIM_CONSOLE_PROTOCOL}",
+  "host": "${OPENHIM_CORE_MEDIATOR_HOSTNAME}",
+  "hostPath": "${OPENHIM_CONSOLE_HOSTPATH}",
+  "port": "${OPENHIM_MEDIATOR_API_PORT}",
+  "title": "Admin Console",
+  "footerTitle": "OpenHIM Administration Console",
+  "footerPoweredBy": "<a href='http://openhim.org/' target='_blank'>Powered by OpenHIM</a>",
+  "loginBanner": "",
+  "mediatorLastHeartbeatWarningSeconds": ${OPENHIM_MEDIATOR_HEALTH_WARNING_TIMEOUT},
+  "mediatorLastHeartbeatDangerSeconds": ${OPENHIM_MEDIATOR_HEALTH_DANGER_TIMEOUT},
+  "showLoginForm": ${OPENHIM_CONSOLE_SHOW_LOGIN},
+  "ssoEnabled": ${KC_OPENHIM_SSO_ENABLED},
+  "keyCloakUrl": "${KC_FRONTEND_URL}",
+  "keyCloakRealm": "${KC_REALM_NAME}",
+  "keyCloakClientId": "${KC_OPENHIM_CLIENT_ID}"
+}

app/config/default.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.1",
+  "version": "1.17.0",
   "minimumCoreVersion": "5.0.0",
   "protocol": "https",
   "host": "localhost",

docker-entrypoint.sh

@@ -0,0 +1,16 @@
+# Set defaults for the environment variables
+export OPENHIM_CONSOLE_PROTOCOL=${OPENHIM_CONSOLE_PROTOCOL:-"https"}
+export OPENHIM_CONSOLE_HOSTPATH=${OPENHIM_CONSOLE_HOSTPATH:-""}
+export OPENHIM_CORE_MEDIATOR_HOSTNAME=${OPENHIM_CORE_MEDIATOR_HOSTNAME:-"localhost"}
+export OPENHIM_MEDIATOR_API_PORT=${OPENHIM_MEDIATOR_API_PORT:-"8080"}
+export OPENHIM_MEDIATOR_HEALTH_WARNING_TIMEOUT=${OPENHIM_MEDIATOR_HEALTH_WARNING_TIMEOUT:-"60"}
+export OPENHIM_MEDIATOR_HEALTH_DANGER_TIMEOUT=${OPENHIM_MEDIATOR_HEALTH_DANGER_TIMEOUT:-"120"}
+export OPENHIM_CONSOLE_SHOW_LOGIN=${OPENHIM_CONSOLE_SHOW_LOGIN:-"true"}
+export KC_OPENHIM_SSO_ENABLED=${KC_OPENHIM_SSO_ENABLED:-"false"}
+export KC_FRONTEND_URL=${KC_FRONTEND_URL:-"http://localhost:9088"}
+export KC_REALM_NAME=${KC_REALM_NAME:-"platform-realm"}
+export KC_OPENHIM_CLIENT_ID=${KC_OPENHIM_CLIENT_ID:-"openhim-oauth"}
+
+cat config/default-env.json | envsubst | tee config/default.json
+
+nginx -g "daemon off;"

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"name": "openhim-console",
 	"description": "This application provides a web application to configure and manage the OpenHIM-core component.",
-	"version": "1.16.1",
+	"version": "1.17.0",
 	"dependencies": {
 		"@types/http-server": "^0.10.1",
 		"http-server": "^0.12.3",

package.json

@@ -3,7 +3,7 @@
 RELEASE_VERSION=$1
 if [ -z ${RELEASE_VERSION} ]
 then
-  echo "You need so specify the release version you wish to build: e.g './build-docker-centos-rpm.sh 1.16.1'"
+  echo "You need so specify the release version you wish to build: e.g './build-docker-centos-rpm.sh 1.17.0'"
   echo "https://github.com/jembi/openhim-console/releases"
   exit
 fi