Merge pull request #83 from jembi/revert-79-jsreport-ports-update

Revert "The config importer [will minimize the issue]"
jembi · Jun 29, 2022 · c0b6d69 · c0b6d69
2 parents 3d41fd6 + b1446f7
commit c0b6d69
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 38 deletions.
diff --git a/analytics-datastore-elastic-search/docker-compose.dev.yml b/analytics-datastore-elastic-search/docker-compose.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 9200
  published: 9201
- mode: ingress
+ mode: host
diff --git a/analytics-datastore-elastic-search/swarm.sh b/analytics-datastore-elastic-search/swarm.sh
@@ -134,8 +134,6 @@ if [[ "$Action" == "init" ]]; then
  InstallExpect
  SetElasticsearchPasswords
 
- config::await_network_join "instant_analytics-datastore-elastic-search"
-
  ImportElasticIndex
 
  echo "Done initialising"

diff --git a/dashboard-visualiser-jsreport/docker-compose.dev.yml b/dashboard-visualiser-jsreport/docker-compose.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 5488
  published: 5488
- mode: ingress
+ mode: host
diff --git a/dashboard-visualiser-kibana/docker-compose.dev.yml b/dashboard-visualiser-kibana/docker-compose.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 5601
  published: 5601
- mode: ingress
+ mode: host
diff --git a/dashboard-visualiser-kibana/swarm.sh b/dashboard-visualiser-kibana/swarm.sh
@@ -56,8 +56,6 @@ main() {
 
  config::await_service_running "dashboard-visualiser-kibana" "${COMPOSE_FILE_PATH}/docker-compose.await-helper.yml" "$KIBANA_INSTANCES"
 
- config::await_network_join "dashboard-visualiser-kibana"
-
  echo "Setting config digests"
  config::set_config_digests "$COMPOSE_FILE_PATH"/importer/docker-compose.config.yml
  docker stack deploy -c "${COMPOSE_FILE_PATH}"/importer/docker-compose.config.yml instant

diff --git a/data-mapper-logstash/docker-compose.dev.yml b/data-mapper-logstash/docker-compose.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 5055
  published: 5055
- mode: ingress
+ mode: host
diff --git a/fhir-datastore-hapi-fhir/docker-compose-postgres.dev.yml b/fhir-datastore-hapi-fhir/docker-compose-postgres.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 5432
  published: 5432
- mode: ingress
+ mode: host
diff --git a/fhir-datastore-hapi-fhir/docker-compose.dev.yml b/fhir-datastore-hapi-fhir/docker-compose.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 8080
  published: 3447
- mode: ingress
+ mode: host
diff --git a/interoperability-layer-openhim/docker-compose-mongo.dev.yml b/interoperability-layer-openhim/docker-compose-mongo.dev.yml
@@ -5,4 +5,4 @@ services:
  ports:
  - target: 27017
  published: 27017
- mode: ingress
+ mode: host
diff --git a/interoperability-layer-openhim/docker-compose.dev.yml b/interoperability-layer-openhim/docker-compose.dev.yml
@@ -5,25 +5,25 @@ services:
  ports:
  - target: 8080
  published: 8080
- mode: ingress
+ mode: host
  - target: 5000
  published: 5000
- mode: ingress
+ mode: host
  - target: 5001
  published: 5001
- mode: ingress
+ mode: host
  - target: 5050
  published: 5050
- mode: ingress
+ mode: host
  - target: 5051
  published: 5051
- mode: ingress
+ mode: host
  - target: 5052
  published: 5052
- mode: ingress
+ mode: host
 
  openhim-console:
  ports:
  - target: 80
  published: 9000
- mode: ingress
+ mode: host
diff --git a/message-bus-kafka/docker-compose.dev.yml b/message-bus-kafka/docker-compose.dev.yml
@@ -5,10 +5,10 @@ services:
  ports:
  - target: 9092
  published: 9092
- mode: ingress
+ mode: host
 
  kafdrop:
  ports:
  - target: 9013
  published: 9013
- mode: ingress
+ mode: host
diff --git a/utils/config-utils.sh b/utils/config-utils.sh
@@ -202,24 +202,6 @@ config::await_service_removed() {
  done
 }
 
-# Waits for the provided service to join the network
-#
-# Arguments:
-# $1 : service name (eg. instant_analytics-datastore-elastic-search)
-config::await_network_join() {
- local -r SERVICE_NAME="${1:?"FATAL: await_service_removed SERVICE_NAME not provided"}"
- local start_time=$(date +%s)
- local exit_time=30
- local warning_time=10
-
- echo "Waiting for ${SERVICE_NAME} to join network..."
-
- until [[ $(docker network inspect -v instant_default -f "{{.Services}}") == *"${SERVICE_NAME}"* ]]; do
- config::timeout_check $start_time "${SERVICE_NAME} to join the network" $exit_time $warning_time
- sleep 1
- done
-}
-
 # Generates configs for a service from a folder and adds them to a temp docker-compose file
 #
 # Arguments: