Remove redundant network definition from pgpool & fix swarm.sh if check

jembi · Sep 1, 2023 · 7688185 · 7688185
1 parent 25de410
commit 7688185
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/fhir-datastore-hapi-fhir/docker-compose-pgpool.cluster.yml b/fhir-datastore-hapi-fhir/docker-compose-pgpool.cluster.yml
@@ -34,8 +34,6 @@ services:
  PGPOOL_ENABLE_LOAD_BALANCING: "no"
  PGPOOL_AUTO_FAILBACK: "yes"
  PGPOOL_USER_CONF_FILE: "/config/custom_pgpool.conf"
- networks:
- default:
 
  pgpool-2:
  image: bitnami/pgpool:4.4.3
@@ -70,8 +68,6 @@ services:
  PGPOOL_ENABLE_LOAD_BALANCING: "no"
  PGPOOL_AUTO_FAILBACK: "yes"
  PGPOOL_USER_CONF_FILE: "/config/custom_pgpool.conf"
- networks:
- default:
 
  pgpool-3:
  image: bitnami/pgpool:4.4.3
@@ -106,8 +102,6 @@ services:
  PGPOOL_ENABLE_LOAD_BALANCING: "no"
  PGPOOL_AUTO_FAILBACK: "yes"
  PGPOOL_USER_CONF_FILE: "/config/custom_pgpool.conf"
- networks:
- default:
 
 configs:
  pgpool.conf:

diff --git a/fhir-datastore-hapi-fhir/swarm.sh b/fhir-datastore-hapi-fhir/swarm.sh
@@ -51,7 +51,7 @@ function initialize_package() {
  (
  docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose-postgres.yml" "$postgres_cluster_compose_filename" "$postgres_dev_compose_filename"
 
- if [ "${CLUSTERED_MODE}" == "true" && "${HF_PGPOOL_ENABLED}" == "true" ]; then
+ if [[ "${CLUSTERED_MODE}" == "true" && "${HF_PGPOOL_ENABLED}" == "true" ]]; then
  docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose-pgpool.cluster.yml"
  fi