diff --git a/docker-compose/dynamic-mapping/.env b/docker-compose/dynamic-mapping/.env index 28673c04..c155139a 100644 --- a/docker-compose/dynamic-mapping/.env +++ b/docker-compose/dynamic-mapping/.env @@ -1,4 +1,3 @@ -PROJECT_DIR_NAME=dynamic-mapping COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=griddynamicmapping COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../study/docker-compose.override.yml:../technical/docker-compose.technical.yml diff --git a/docker-compose/explicit-profiles/.env b/docker-compose/explicit-profiles/.env index 5b281365..baf830c1 100644 --- a/docker-compose/explicit-profiles/.env +++ b/docker-compose/explicit-profiles/.env @@ -1,11 +1,3 @@ -PROJECT_STUDY_DIR_NAME=study -PROJECT_DYNAMIC_MAPPING_DIR_NAME=dynamic-mapping -PROJECT_SUITE_DIR_NAME=suite -DATABASE_PREFIX_NAME= -#PROJECT_DIR_NAME: use "explicit-profiles" for this env with dynamic profiles, and not "study"/"suite" values because our scripts -# will block postgres container if geo-data-server container is not started (because the user explicitly chose other profiles) -# and the PROJECT_DIR_NAME is one of those values -PROJECT_DIR_NAME=explicit-profiles COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=grid COMPOSE_FILE=../docker-compose.base.yml:../study/docker-compose.override.yml:../dynamic-mapping/docker-compose.override.yml:../technical/docker-compose.technical.yml:../monitor/docker-compose.override.yml diff --git a/docker-compose/monitor/.env b/docker-compose/monitor/.env index 54963e3a..3fb67672 100644 --- a/docker-compose/monitor/.env +++ b/docker-compose/monitor/.env @@ -1,5 +1,3 @@ -PROJECT_DIR_NAME=monitor -PROJECT_STUDY_DIR_NAME=monitor COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=gridmonitor COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../dynamic-mapping/docker-compose.override.yml:../study/docker-compose.override.yml:../technical/docker-compose.technical.yml diff --git a/docker-compose/study/.env b/docker-compose/study/.env index cb1a2740..e370e96b 100644 --- a/docker-compose/study/.env +++ b/docker-compose/study/.env @@ -1,5 +1,6 @@ -PROJECT_DIR_NAME=study -PROJECT_STUDY_DIR_NAME=study +SHOULD_INIT_GEO_DATA=true +SHOULD_INIT_LINES_CATALOG=true + COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=gridstudy COMPOSE_FILE=docker-compose.override.yml:../docker-compose.base.yml:../dynamic-mapping/docker-compose.override.yml:../technical/docker-compose.technical.yml diff --git a/docker-compose/suite/.env b/docker-compose/suite/.env index 51a3a917..f3034e45 100644 --- a/docker-compose/suite/.env +++ b/docker-compose/suite/.env @@ -1,5 +1,6 @@ -PROJECT_DIR_NAME=suite -PROJECT_SUITE_DIR_NAME=suite +SHOULD_INIT_GEO_DATA=true +SHOULD_INIT_LINES_CATALOG=true + COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=gridsuite COMPOSE_FILE=docker-compose.marker.yml:../docker-compose.base.yml:../study/docker-compose.override.yml:../dynamic-mapping/docker-compose.override.yml:../technical/docker-compose.technical.yml diff --git a/docker-compose/technical/.env b/docker-compose/technical/.env index d5e07aa0..bbe54ee1 100644 --- a/docker-compose/technical/.env +++ b/docker-compose/technical/.env @@ -1,6 +1,3 @@ -PROJECT_STUDY_DIR_NAME=study -PROJECT_SUITE_DIR_NAME=suite -PROJECT_DIR_NAME=technical COMPOSE_PATH_SEPARATOR=: COMPOSE_PROJECT_NAME=gridtechnical COMPOSE_FILE=docker-compose.technical.yml diff --git a/docker-compose/technical/init-geo-data.sh b/docker-compose/technical/init-geo-data.sh index db0b60ae..ea3d29f3 100755 --- a/docker-compose/technical/init-geo-data.sh +++ b/docker-compose/technical/init-geo-data.sh @@ -4,7 +4,7 @@ set -e function curl_() { - curl -f -s -o /dev/null -H "Content-Type: application/json" "$@" + curl --noproxy '*' -f -s -o /dev/null -H "Content-Type: application/json" "$@" } function init_geo_data() @@ -17,7 +17,9 @@ function init_geo_data() ([ ! -f "$FILE_LINES" ] || curl_ -d@$FILE_LINES http://geo-data-server/v1/lines) } -if [ "$PROJECT_DIR_NAME" == "$PROJECT_STUDY_DIR_NAME" ] || [ "$PROJECT_DIR_NAME" == "$PROJECT_SUITE_DIR_NAME" ] +SHOULD_INIT_GEO_DATA="${SHOULD_INIT_GEO_DATA:-false}" + +if [ "SHOULD_INIT_GEO_DATA" = "true" ] then until init_geo_data do diff --git a/docker-compose/technical/init-lines-catalog.sh b/docker-compose/technical/init-lines-catalog.sh index e1635c06..a6bc4dec 100755 --- a/docker-compose/technical/init-lines-catalog.sh +++ b/docker-compose/technical/init-lines-catalog.sh @@ -6,11 +6,13 @@ function init_lines_catalog() { LINES_CATALOG=/init-data/lines-catalog.json.gz if [ -f $LINES_CATALOG ]; then - curl -X 'POST' -f -s -o /dev/null 'http://network-modification-server/v1/network-modifications/catalog/line_types' -F "file=@${LINES_CATALOG}" + curl -X 'POST' --noproxy '*' -f -s -o /dev/null 'http://network-modification-server/v1/network-modifications/catalog/line_types' -F "file=@${LINES_CATALOG}" fi } -if [ "$PROJECT_DIR_NAME" == "$PROJECT_STUDY_DIR_NAME" ] || [ "$PROJECT_DIR_NAME" == "$PROJECT_SUITE_DIR_NAME" ] +SHOULD_INIT_LINES_CATALOG="${SHOULD_INIT_LINES_CATALOG:-false}" + +if [ "SHOULD_INIT_LINES_CATALOG" = "true" ] then until init_lines_catalog do