From 9675136c417725daf26af5a0f1c77fd8cdbc02eb Mon Sep 17 00:00:00 2001 From: Piotr Mankowski Date: Sat, 7 Dec 2024 00:40:45 +0000 Subject: [PATCH 1/2] Added dev option for isanteplus --- .../emr-isanteplus/docker-compose.dev.yml | 6 ++++++ packages/emr-isanteplus/swarm.sh | 20 +++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 packages/emr-isanteplus/docker-compose.dev.yml diff --git a/packages/emr-isanteplus/docker-compose.dev.yml b/packages/emr-isanteplus/docker-compose.dev.yml new file mode 100644 index 0000000..f511222 --- /dev/null +++ b/packages/emr-isanteplus/docker-compose.dev.yml @@ -0,0 +1,6 @@ +services: + isanteplus: + ports: + - target: 8080 + published: 8090 + mode: host diff --git a/packages/emr-isanteplus/swarm.sh b/packages/emr-isanteplus/swarm.sh index 2c129ab..b12ac6a 100644 --- a/packages/emr-isanteplus/swarm.sh +++ b/packages/emr-isanteplus/swarm.sh @@ -32,24 +32,22 @@ function import_sources() { } function initialize_package() { - - - # if [ "${MODE}" == "dev" ]; then - # log info "Running package in DEV mode" - # postgres_dev_compose_filename="docker-compose-postgres.dev.yml" - # hapi_fhir_dev_compose_filename="docker-compose.dev.yml" - # else - log info "Running package in PROD mode" - #fi + isanteplus_compose_dev_filename="" + + if [ "${MODE}" == "dev" ]; then + log info "Running package in DEV mode" + isanteplus_compose_dev_filename="docker-compose.dev.yml" + else + log info "Running package in PROD mode" + fi # if [ "${CLUSTERED_MODE}" == "true" ]; then # postgres_cluster_compose_filename="docker-compose-postgres.cluster.yml" # fi ( - #docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose-mysql.yml" - docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose.yml" + docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose.yml" "${isanteplus_compose_dev_filename}" ) || { log error "Failed to deploy package" From 1c269dbe64e2e6f53749fea4b2f2fe723f691626 Mon Sep 17 00:00:00 2001 From: Piotr Mankowski Date: Sat, 7 Dec 2024 00:51:07 +0000 Subject: [PATCH 2/2] Local mysql option --- packages/database-mysql/swarm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/database-mysql/swarm.sh b/packages/database-mysql/swarm.sh index 0c26158..9c453a9 100644 --- a/packages/database-mysql/swarm.sh +++ b/packages/database-mysql/swarm.sh @@ -57,7 +57,10 @@ function initialize_package() { ( # Deploy the MySQL service using the base compose file and optionally the dev file - docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose.yml" "" "$mysql_dev_compose_filename" + if [ "${MYSQL_USE_LOCAL}" == "false" ]; then + docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose.yml" "" "$mysql_dev_compose_filename" + fi + # docker::deploy_service "$STACK" "${COMPOSE_FILE_PATH}" "docker-compose.yml" "" "$mysql_dev_compose_filename" ) || { log error "Failed to deploy package"