Merge pull request #237 from jembi/fix-new-openhim-console-dockerfile

feat: Remove envsubst logic from openhim-console

interoperability-layer-openhim/docker-compose.yml

@@ -30,7 +30,7 @@ services:
  memory: ${OPENHIM_MEMORY_RESERVE}
 
  openhim-console:
- image: jembi/openhim-console:v1.16.2
+ image: jembi/openhim-console:v1.17.0
  environment:
  OPENHIM_CORE_MEDIATOR_HOSTNAME: ${OPENHIM_CORE_MEDIATOR_HOSTNAME}
  OPENHIM_MEDIATOR_API_PORT: ${OPENHIM_MEDIATOR_API_PORT}
@@ -43,9 +43,6 @@ services:
  keycloak:
  public:
  default:
- configs:
- - source: console-default.json
- target: /usr/share/nginx/html/config/default.json
  deploy:
  replicas: ${OPENHIM_CONSOLE_INSTANCES}
  placement:
@@ -58,13 +55,6 @@ services:
  cpus: ${OPENHIM_CONSOLE_CPU_RESERVE}
  memory: ${OPENHIM_CONSOLE_MEMORY_RESERVE}
 
-configs:
- console-default.json:
- file: ./importer/volume/default.json
- name: console.config-${console_config_DIGEST:?err}
- labels:
- name: openhim
-
 networks:
  reverse-proxy:
  name: reverse-proxy_public

interoperability-layer-openhim/swarm.sh

@@ -31,11 +31,6 @@ function import_sources() {
  source "${UTILS_PATH}/log.sh"
 }
 
-function prepare_console_config() {
- # Replace env vars
- envsubst <"${COMPOSE_FILE_PATH}/importer/volume/default-env.json" >"${COMPOSE_FILE_PATH}/importer/volume/default.json"
-}
-
 function initialize_package() {
  local mongo_cluster_compose_filename=""
  local mongo_dev_compose_filename=""
@@ -60,8 +55,6 @@ function initialize_package() {
  try "${COMPOSE_FILE_PATH}/initiate-replica-set.sh $STACK" throw "Fatal: Initiate Mongo replica set failed"
  fi
 
- prepare_console_config
-
  docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.yml" "$openhim_dev_compose_filename"
 
  log info "Waiting OpenHIM Core to be running and responding"