diff --git a/.gitignore b/.gitignore index 84d36d61b..4044b4b70 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ birdhouse/env.local birdhouse/certkey.pem birdhouse/cert.pem birdhouse/key.pem +birdhouse/build/ ## Deployment vagrant_variables.yml diff --git a/CHANGES.md b/CHANGES.md index dbdb85281..ad7d57ca3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,22 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes + +- Write build context to a build directory instead of using `birdhouse/`: + - Links all files needed to run `docker compose` commands to a build directory + - Generates a unified `docker-compose.yml` file that can be easily inspected to see exactly what is being deployed. + - Writes the generated output of template files to a new directory instead of beside the original template file + - this will keep the repo cleaner and won't require keeping legacy files in the various `.gitignore` file peppered + throughout the repository. + - The build directory is in `birdhouse/build` by default but can be changed by setting the `BUILD_DIR` variable in + `env.local`. + - No longer requires that custom component config files be placed relative to `./birdhouse/docker-compose.yml` since + these files are copied to the relevant location in the build directory. + - previously, file paths in `docker-compose-extra.yml` files were either absolute or relative paths from the + `birdhouse/` directory. + - now, they are absolute or relative paths from the parent of the component's directory (this resolves to the build + directory when the stack is started up). [1.33.5](https://github.com/bird-house/birdhouse-deploy/tree/1.33.5) (2023-10-02) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/.gitignore b/birdhouse/.gitignore new file mode 100644 index 000000000..bb7d4baa7 --- /dev/null +++ b/birdhouse/.gitignore @@ -0,0 +1,188 @@ +# This file contains files to ignore that were generated when writing the result of template files +# to the same directory as the template file itself. This is no longer necessary since all dynamically +# generated files are written to the BUILD_DIR directory. +# This .gitignore is kept for backwards compatibility so that if a deployment still contains these files +# they will still be ignored properly. +# This .gitignore file may be removed at a later date. +components/cowbird/conf.extra-service.d/cowbird.conf +components/cowbird/config/canarie-api/canarie_api_monitoring.py +components/cowbird/config/canarie-api/cowbird_config.py +components/cowbird/config/cowbird/celeryconfig.py +components/cowbird/config/cowbird/config.yml +components/cowbird/config/cowbird/cowbird.ini +components/cowbird/config/magpie/config.yml +components/cowbird/config/proxy/canarie_api_monitoring.py +components/cowbird/config/proxy/conf.extra-service.d/cowbird.conf +components/monitoring/alertmanager.yml +components/monitoring/config/magpie/config.yml +components/monitoring/config/proxy/conf.extra-service.d/monitoring.conf +components/monitoring/grafana_dashboards.yml +components/monitoring/grafana_datasources.yml +components/monitoring/prometheus.rules +components/monitoring/prometheus.yml +components/scheduler/config.yml +components/weaver/conf.extra-service.d/weaver.conf +components/weaver/config/canarie-api/canarie_api_monitoring.py +components/weaver/config/canarie-api/weaver_config.py +components/weaver/config/magpie/config.yml +components/weaver/config/proxy/canarie_api_monitoring.py +components/weaver/config/proxy/conf.extra-service.d/weaver.conf +components/weaver/config/weaver/data_sources.yml +components/weaver/config/weaver/request_options.yml +components/weaver/config/weaver/weaver.ini +components/weaver/config/weaver/wps_processes.yml +components/weaver/service-config.json +config/canarie-api/conf.extra-service.d/canarie-api.conf +config/canarie-api/config/canarie-api/conf.extra-service.d/canarie-api.conf +config/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf +config/canarie-api/docker_configuration.py +config/catalog/ +config/finch/config/canarie-api/canarie_api_monitoring.py +config/finch/config/magpie/providers.cfg +config/finch/config/proxy/canarie_api_monitoring.py +config/finch/service-config.json +config/finch/wps.cfg +deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py +deprecated-components/flyingpigeon/config/magpie/permissions.cfg +deprecated-components/flyingpigeon/config/magpie/providers.cfg +deprecated-components/flyingpigeon/service-config.json +deprecated-components/flyingpigeon/wps.cfg +config/frontend/ +config/geoserver/config/canarie-api/canarie_api_monitoring.py +config/geoserver/config/magpie/providers.cfg +config/geoserver/config/proxy/canarie_api_monitoring.py +config/geoserver/config/proxy/conf.extra-service.d/geoserver.conf +config/geoserver/geoserver_canarie_api_monitoring.py +config/geoserver/geoserver-magpie-provider.cfg +config/geoserver/service-config.json +config/hummingbird/config/canarie-api/canarie_api_monitoring.py +config/hummingbird/config/magpie/providers.cfg +config/hummingbird/custom.cfg +config/hummingbird/service-config.json +config/jupyterhub/config/canarie-api/canarie_api_monitoring.py +config/jupyterhub/config/proxy/canarie_api_monitoring.py +config/jupyterhub/config/proxy/conf.extra-service.d/jupyterhub.conf +config/jupyterhub/custom_templates/login.html +config/jupyterhub/jupyterhub_canarie_api_monitoring.py +config/jupyterhub/jupyterhub_config.py +config/jupyterhub/service-config.json +config/magpie/config/canarie-api/canarie_api_monitoring.py +config/magpie/config/proxy/canarie_api_monitoring.py +config/magpie/config/proxy/conf.extra-service.d/magpie.conf +config/magpie/docker-entrypoint-initdb.d/create-db.sql +config/magpie/magpie_canarie_api_monitoring.py +config/magpie/magpie.ini +config/magpie/permissions.cfg +config/magpie/postgres-credentials.env +config/magpie/providers.cfg +config/malleefowl/ +config/ncops/ +config/ncwms2/ +config/phoenix/ +config/portainer/config/proxy/conf.extra-service.d/portainer.conf +config/postgres/credentials.env +config/postgres-magpie/ +config/project-api/ +config/proxy/conf.d/all-services.include +config/proxy/conf.d/frontend.conf +config/proxy/conf.d/lb_catalog.conf +config/proxy/conf.d/lb_emu.conf +config/proxy/conf.d/lb_flyingpigeon.conf +config/proxy/conf.d/lb_malleefowl.conf +config/proxy/conf.d/lb_ncops.conf +config/proxy/nginx.conf +config/proxy/static/ +config/raven/config/canarie-api/canarie_api_monitoring.py +config/raven/config/magpie/providers.cfg +config/raven/config/proxy/canarie_api_monitoring.py +config/raven/service-config.json +config/raven/wps.cfg +config/solr/ +config/thredds/catalog.xml +config/thredds/config/canarie-api/canarie_api_monitoring.py +config/thredds/config/magpie/providers.cfg +config/thredds/config/proxy/canarie_api_monitoring.py +config/thredds/config/proxy/conf.extra-service.d/thredds.conf +config/thredds/service-config.json +config/thredds/threddsConfig.xml +config/twitcher/config/canarie-api/canarie_api_monitoring.py +config/twitcher/config/proxy/canarie_api_monitoring.py +config/twitcher/config/proxy/conf.extra-service.d/twitcher.conf +config/twitcher/twitcher.ini +config/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py +config/wps_outputs-volume/config/proxy/canarie_api_monitoring.py +config/wps_outputs-volume/config/proxy/conf.extra-service.d/wps_outputs-volume.conf +deprecated-components/catalog/catalog.cfg +deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py +deprecated-components/catalog/config/magpie/permissions.cfg +deprecated-components/catalog/config/magpie/providers.cfg +deprecated-components/catalog/config/proxy/canarie_api_monitoring.py +deprecated-components/frontend/conf.extra-service.d/frontend.conf +deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py +deprecated-components/frontend/config/proxy/canarie_api_monitoring.py +deprecated-components/frontend/config/proxy/conf.extra-service.d/frontend.conf +deprecated-components/frontend/frontend.env +deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py +deprecated-components/malleefowl/config/magpie/providers.cfg +deprecated-components/malleefowl/config/proxy/canarie_api_monitoring.py +deprecated-components/malleefowl/custom.cfg +deprecated-components/malleefowl/malleefowl_canarie_api_monitoring.py +deprecated-components/ncops/ncops.cfg +deprecated-components/ncwms2/config/magpie/providers.cfg +deprecated-components/ncwms2/config/proxy/conf.extra-service.d/ncwms2.conf +deprecated-components/ncwms2/custom.cfg +deprecated-components/ncwms2/ncwms2-magpie-provider.cfg +deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py +deprecated-components/phoenix/config/proxy/canarie_api_monitoring.py +deprecated-components/phoenix/custom.cfg +deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py +deprecated-components/project-api/config/proxy/canarie_api_monitoring.py +deprecated-components/project-api/config/proxy/conf.extra-service.d/project-api.conf +deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py +deprecated-components/solr/config/proxy/canarie_api_monitoring.py +optional-components/canarie-api-full-monitoring/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/canarie-api/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/proxy/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py +optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py +optional-components/emu/config/canarie-api/canarie_api_monitoring.py +optional-components/emu/config/magpie/permissions.cfg +optional-components/emu/config/magpie/providers.cfg +optional-components/emu/config/proxy/canarie_api_monitoring.py +optional-components/emu/emu_canarie_api_monitoring.py +optional-components/emu/emu-magpie-permission.cfg +optional-components/emu/emu-magpie-provider.cfg +optional-components/emu/wps.cfg +optional-components/generic_bird/config/canarie-api/canarie_api_monitoring.py +optional-components/generic_bird/config/magpie/permissions.cfg +optional-components/generic_bird/config/magpie/providers.cfg +optional-components/generic_bird/config/proxy/canarie_api_monitoring.py +optional-components/generic_bird/generic_bird_canarie_api_monitoring.py +optional-components/generic_bird/generic_bird-magpie-permission.cfg +optional-components/generic_bird/generic_bird-magpie-provider.cfg +optional-components/generic_bird/postgres/credentials.env +optional-components/generic_bird/wps.cfg +optional-components/secure-data-proxy/conf.extra-service.d/secure-data-auth.conf +optional-components/secure-data-proxy/config/magpie/config.yml +optional-components/secure-data-proxy/config/proxy/conf.extra-service.d/secure-data-auth.conf +optional-components/test-geoserver-secured-access/config/magpie/permissions.cfg +optional-components/test-geoserver-secured-access/config/magpie/providers.cfg +optional-components/test-geoserver-secured-access/config/magpie/test-geoserver-permissions.cfg +optional-components/test-geoserver-secured-access/config/magpie/test-geoserver-providers.cfg +optional-components/test-geoserver-secured-access/config/proxy/conf.d/test-geoserver-secured.conf +optional-components/testthredds/catalog.xml +optional-components/testthredds/conf.extra-service.d/ +optional-components/testthredds/config/canarie-api/canarie_api_monitoring.py +optional-components/testthredds/config/proxy/canarie_api_monitoring.py +optional-components/testthredds/config/proxy/conf.extra-service.d/testthredds-service.conf +optional-components/testthredds/testthredds_canarie_api_monitoring.py +optional-components/testthredds/threddsConfig.xml +optional-components/test-weaver/config/magpie/test-weaver-permissions.yml +optional-components/test-weaver/config/weaver/request_options.yml diff --git a/birdhouse/components/cowbird/.gitignore b/birdhouse/components/cowbird/.gitignore deleted file mode 100644 index d6bf1922d..000000000 --- a/birdhouse/components/cowbird/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -config/cowbird/celeryconfig.py -config/cowbird/config.yml -config/cowbird/cowbird.ini -config/magpie/config.yml -config/proxy/conf.extra-service.d/cowbird.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -conf.extra-service.d/cowbird.conf -config/canarie-api/cowbird_config.py -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml index b81c0f0d2..950dce4b0 100644 --- a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml @@ -9,4 +9,4 @@ services: # the Cowbird config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'. # It is important to load Cowbird before, as the full monitoring need to know if 'Cowbird' service is added to the # stack in order to apply the corresponding public endpoint conditionally. - - ./components/cowbird/config/proxy/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_cowbird_config.py:ro + - ./cowbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_cowbird_config.py:ro diff --git a/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml b/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml index d0a9e15f7..273321b75 100644 --- a/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/config/magpie/docker-compose-extra.yml @@ -12,10 +12,10 @@ services: # duplicate references for providers/permissions/webhooks config files. This is because 'MAGPIE_CONFIG_PATH' is # not used to allow parsing additive per-component config files for each extendable service, using loading of # all configuration files found in mounted directories. - - ./components/cowbird/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/cowbird.yml:ro - - ./components/cowbird/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/cowbird.yml:ro - - ./components/cowbird/config/magpie/config.yml:${MAGPIE_WEBHOOKS_CONFIG_PATH}/cowbird.yml:ro + - ./cowbird/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/cowbird.yml:ro + - ./cowbird/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/cowbird.yml:ro + - ./cowbird/config/magpie/config.yml:${MAGPIE_WEBHOOKS_CONFIG_PATH}/cowbird.yml:ro cowbird-worker: env_file: # user/password for admin session to perform permission sync updates - - ./config/magpie/postgres-credentials.env + - ./magpie/postgres-credentials.env diff --git a/birdhouse/components/cowbird/config/proxy/docker-compose-extra.yml b/birdhouse/components/cowbird/config/proxy/docker-compose-extra.yml index 88b6e85ba..7a1282488 100644 --- a/birdhouse/components/cowbird/config/proxy/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/config/proxy/docker-compose-extra.yml @@ -4,6 +4,6 @@ services: # extend proxy with endpoint and config for Cowbird API access proxy: volumes: - - ./components/cowbird/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/cowbird:ro + - ./cowbird/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/cowbird:ro links: - cowbird diff --git a/birdhouse/components/cowbird/docker-compose-extra.yml b/birdhouse/components/cowbird/docker-compose-extra.yml index a6b28bd77..4a06d3a60 100644 --- a/birdhouse/components/cowbird/docker-compose-extra.yml +++ b/birdhouse/components/cowbird/docker-compose-extra.yml @@ -38,10 +38,10 @@ services: depends_on: - cowbird-mongodb volumes: - - ./components/cowbird/config/cowbird/config.yml:/opt/local/src/cowbird/config/cowbird.yml - - ./components/cowbird/config/cowbird/cowbird.ini:/opt/local/src/cowbird/config/cowbird.ini + - ./cowbird/config/cowbird/config.yml:/opt/local/src/cowbird/config/cowbird.yml + - ./cowbird/config/cowbird/cowbird.ini:/opt/local/src/cowbird/config/cowbird.ini # even if not running tasks here, they must be registered to send them off to the right place! - - ./components/cowbird/config/cowbird/celeryconfig.py:/opt/local/src/cowbird/config/celeryconfig.py + - ./cowbird/config/cowbird/celeryconfig.py:/opt/local/src/cowbird/config/celeryconfig.py - "${DATA_PERSIST_SHARED_ROOT}:${DATA_PERSIST_SHARED_ROOT}" restart: always logging: *default-logging @@ -68,9 +68,9 @@ services: - cowbird-mongodb - cowbird # if not started first, sometimes celery misbehaves and will not pick jobs in queue volumes: - - ./components/cowbird/config/cowbird/config.yml:/opt/local/src/cowbird/config/cowbird.yml - - ./components/cowbird/config/cowbird/cowbird.ini:/opt/local/src/cowbird/config/cowbird.ini - - ./components/cowbird/config/cowbird/celeryconfig.py:/opt/local/src/cowbird/config/celeryconfig.py + - ./cowbird/config/cowbird/config.yml:/opt/local/src/cowbird/config/cowbird.yml + - ./cowbird/config/cowbird/cowbird.ini:/opt/local/src/cowbird/config/cowbird.ini + - ./cowbird/config/cowbird/celeryconfig.py:/opt/local/src/cowbird/config/celeryconfig.py - "${DATA_PERSIST_SHARED_ROOT}/${USER_WORKSPACES}:${DATA_PERSIST_SHARED_ROOT}/${USER_WORKSPACES}" restart: always logging: *default-logging diff --git a/birdhouse/components/monitoring/.gitignore b/birdhouse/components/monitoring/.gitignore deleted file mode 100644 index 943d6b326..000000000 --- a/birdhouse/components/monitoring/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -prometheus.yml -grafana_datasources.yml -grafana_dashboards.yml -alertmanager.yml -prometheus.rules -config/magpie/config.yml -config/proxy/conf.extra-service.d/monitoring.conf diff --git a/birdhouse/components/monitoring/config/magpie/docker-compose-extra.yml b/birdhouse/components/monitoring/config/magpie/docker-compose-extra.yml index 70844fc59..547b09fdd 100644 --- a/birdhouse/components/monitoring/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/monitoring/config/magpie/docker-compose-extra.yml @@ -3,5 +3,5 @@ version: "3.4" services: magpie: volumes: - - ./components/monitoring/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/monitoring.yml:ro - - ./components/monitoring/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/monitoring.yml:ro + - ./monitoring/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/monitoring.yml:ro + - ./monitoring/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/monitoring.yml:ro diff --git a/birdhouse/components/monitoring/config/proxy/docker-compose-extra.yml b/birdhouse/components/monitoring/config/proxy/docker-compose-extra.yml index da7c5c4d6..92610c786 100644 --- a/birdhouse/components/monitoring/config/proxy/docker-compose-extra.yml +++ b/birdhouse/components/monitoring/config/proxy/docker-compose-extra.yml @@ -3,4 +3,4 @@ version: "3.4" services: proxy: volumes: - - ./components/monitoring/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/monitoring:ro + - ./monitoring/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/monitoring:ro diff --git a/birdhouse/components/monitoring/docker-compose-extra.yml b/birdhouse/components/monitoring/docker-compose-extra.yml index 9487d18aa..b942b0c41 100644 --- a/birdhouse/components/monitoring/docker-compose-extra.yml +++ b/birdhouse/components/monitoring/docker-compose-extra.yml @@ -33,8 +33,8 @@ services: image: prom/prometheus:v2.19.0 container_name: prometheus volumes: - - ./components/monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:ro - - ./components/monitoring/prometheus.rules:/etc/prometheus/prometheus.rules:ro + - ./monitoring/prometheus.yml:/etc/prometheus/prometheus.yml:ro + - ./monitoring/prometheus.rules:/etc/prometheus/prometheus.rules:ro - prometheus_persistence:/prometheus:rw command: # restore original CMD from image @@ -55,9 +55,9 @@ services: image: grafana/grafana:7.0.3 container_name: grafana volumes: - - ./components/monitoring/grafana_datasources.yml:/etc/grafana/provisioning/datasources/grafana_datasources.yml:ro - - ./components/monitoring/grafana_dashboards.yml:/etc/grafana/provisioning/dashboards/grafana_dashboards.yml:ro - - ./components/monitoring/grafana_dashboards:/etc/grafana/dashboards:ro + - ./monitoring/grafana_datasources.yml:/etc/grafana/provisioning/datasources/grafana_datasources.yml:ro + - ./monitoring/grafana_dashboards.yml:/etc/grafana/provisioning/dashboards/grafana_dashboards.yml:ro + - ./monitoring/grafana_dashboards:/etc/grafana/dashboards:ro - grafana_persistence:/var/lib/grafana:rw environment: GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD} @@ -73,8 +73,8 @@ services: image: prom/alertmanager:v0.21.0 container_name: alertmanager volumes: - - ./components/monitoring/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro - - ./components/monitoring/alertmanager.tmpl:/etc/alertmanager/template/default.tmpl:ro + - ./monitoring/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro + - ./monitoring/alertmanager.tmpl:/etc/alertmanager/template/default.tmpl:ro - alertmanager_persistence:/alertmanager:rw command: # restore original CMD from image diff --git a/birdhouse/components/scheduler/.gitignore b/birdhouse/components/scheduler/.gitignore deleted file mode 100644 index 1d3ed4c17..000000000 --- a/birdhouse/components/scheduler/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.yml diff --git a/birdhouse/components/scheduler/docker-compose-extra.yml b/birdhouse/components/scheduler/docker-compose-extra.yml index a7faf401c..4369585b0 100644 --- a/birdhouse/components/scheduler/docker-compose-extra.yml +++ b/birdhouse/components/scheduler/docker-compose-extra.yml @@ -6,7 +6,7 @@ services: container_name: scheduler volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - - ./components/scheduler/config.yml:/opt/crontab/config.yml:ro + - ./scheduler/config.yml:/opt/crontab/config.yml:ro environment: COMPOSE_DIR: ${PWD} AUTODEPLOY_DEPLOY_KEY_ROOT_DIR: ${AUTODEPLOY_DEPLOY_KEY_ROOT_DIR} diff --git a/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml index b0c080313..3e38dc89c 100644 --- a/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./components/stac/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/stac_canarie_api_monitoring.py:ro + - ./stac/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/stac_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/stac/config/proxy/docker-compose-extra.yml b/birdhouse/components/stac/config/proxy/docker-compose-extra.yml index f34434020..2abc170f6 100644 --- a/birdhouse/components/stac/config/proxy/docker-compose-extra.yml +++ b/birdhouse/components/stac/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./components/stac/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/stac:ro + - ./stac/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/stac:ro diff --git a/birdhouse/components/weaver/.gitignore b/birdhouse/components/weaver/.gitignore deleted file mode 100644 index 1cd0a2456..000000000 --- a/birdhouse/components/weaver/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -config/magpie/config.yml -config/weaver/data_sources.yml -config/weaver/request_options.yml -config/weaver/wps_processes.yml -config/weaver/weaver.ini -config/proxy/conf.extra-service.d/weaver.conf -config/canarie-api/canarie_api_monitoring.py -service-config.json - -# Old paths. Keep these so that old config files remain uncommittable after updates. -conf.extra-service.d/weaver.conf -config/proxy/canarie_api_monitoring.py -config/canarie-api/weaver_config.py diff --git a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml index e441d76eb..ff565a504 100644 --- a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml @@ -10,5 +10,5 @@ services: # the weaver config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'. # It is important to load Weaver before, as the full monitoring need to know if 'Weaver' service is added to the # stack in order to apply the corresponding public endpoint conditionally. - - ./components/weaver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_weaver_config.py:ro - - ./components/weaver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/weaver_canarie_api_monitoring.py:ro + - ./weaver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_weaver_config.py:ro + - ./weaver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/weaver_canarie_api_monitoring.py:ro diff --git a/birdhouse/components/weaver/config/magpie/docker-compose-extra.yml b/birdhouse/components/weaver/config/magpie/docker-compose-extra.yml index ac8b4ad0e..4cab8c8dc 100644 --- a/birdhouse/components/weaver/config/magpie/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/magpie/docker-compose-extra.yml @@ -8,6 +8,6 @@ services: # Although file uses the "config.yml" format, it is very important to pass it as independent/duplicate reference # provider/permissions config files. This is because 'MAGPIE_CONFIG_PATH' is not used to allow parsing multiple # config files for each extendable service, using loading of all configuration files found in mount directories. - - ./components/weaver/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/weaver-permissions.yml:ro - - ./components/weaver/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/weaver-providers.yml:ro + - ./weaver/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/weaver-permissions.yml:ro + - ./weaver/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/weaver-providers.yml:ro diff --git a/birdhouse/components/weaver/config/proxy/docker-compose-extra.yml b/birdhouse/components/weaver/config/proxy/docker-compose-extra.yml index afb7fae36..124786db3 100644 --- a/birdhouse/components/weaver/config/proxy/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/proxy/docker-compose-extra.yml @@ -4,7 +4,7 @@ services: # extend proxy configuration with weaver endpoints proxy: volumes: - - ./components/weaver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/weaver:ro + - ./weaver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/weaver:ro # because of mounting path naming restrictions (see note in 'worker' definition), # we must add the custom path on top of named 'wps_outputs' volume of other birds for the proxy to expose results - ${WEAVER_WPS_OUTPUTS_DIR}:/pavics-data/wps_outputs/weaver:ro diff --git a/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml b/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml index e1a5fe6d8..5b423ef09 100644 --- a/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml +++ b/birdhouse/components/weaver/config/twitcher/docker-compose-extra.yml @@ -6,5 +6,5 @@ services: volumes: # NOTE: MagpieAdapter hooks are defined within Magpie config, but it is actually Twitcher proxy that runs them # target mount location depends on main docker-compose 'MAGPIE_PROVIDERS_CONFIG_PATH' environment variable - - ./components/weaver/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/weaver-config.yml:ro - - ./components/weaver/config/magpie/weaver_hooks.py:/opt/birdhouse/src/magpie/hooks/weaver_hooks.py:ro + - ./weaver/config/magpie/config.yml:/opt/birdhouse/src/magpie/config/weaver-config.yml:ro + - ./weaver/config/magpie/weaver_hooks.py:/opt/birdhouse/src/magpie/hooks/weaver_hooks.py:ro diff --git a/birdhouse/components/weaver/docker-compose-extra.yml b/birdhouse/components/weaver/docker-compose-extra.yml index d4933d4c5..dd35431bb 100644 --- a/birdhouse/components/weaver/docker-compose-extra.yml +++ b/birdhouse/components/weaver/docker-compose-extra.yml @@ -21,7 +21,7 @@ services: HOSTNAME: ${PAVICS_FQDN} FORWARDED_ALLOW_IPS: "*" #env_file: - # - ./config/mongodb/credentials.env + # - ./mongodb/credentials.env depends_on: - weaver-mongodb links: @@ -30,11 +30,11 @@ services: - default - weaver-mongodb volumes: - - ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro - - ./components/weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml:ro - - ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro - - ./components/weaver/config/weaver/wps_processes.yml:/opt/local/src/weaver/config/wps_processes.yml:ro - - ./components/weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro + - ./weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro + - ./weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml:ro + - ./weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro + - ./weaver/config/weaver/wps_processes.yml:/opt/local/src/weaver/config/wps_processes.yml:ro + - ./weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro # WARNING: see detail in 'worker' definition about below mount location - ${WEAVER_WPS_OUTPUTS_DIR}:${WEAVER_WPS_OUTPUTS_DIR} restart: always @@ -47,7 +47,7 @@ services: environment: DOCKER_HOST: "tcp://docker-proxy:2375" #env_file: - # - ./config/mongodb/credentials.env + # - ./mongodb/credentials.env depends_on: # no 'default' network here such that the worker is not accessible from proxy/http - weaver-mongodb @@ -63,9 +63,9 @@ services: - weaver-mongodb volumes: #- wps_private:/data/wps_private - - ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro - - ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro - - ./components/weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro + - ./weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro + - ./weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro + - ./weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro # WARNING: # Working and output directories must be mounted as exact same path (e.g.: /some/path:/some/path) # to avoid mismatching locations between container-side path resolution of cwltool stagedir/tmpdir/outdir diff --git a/birdhouse/components/weaver/post-docker-compose-up b/birdhouse/components/weaver/post-docker-compose-up index 10de53a85..b15be1658 100755 --- a/birdhouse/components/weaver/post-docker-compose-up +++ b/birdhouse/components/weaver/post-docker-compose-up @@ -335,21 +335,19 @@ echo "${PREFIX}All Weaver remote WPS providers registered successfully!" echo "${PREFIX}Starting Weaver WebApp/Worker Celery tasks validation..." -CUR_SCRIPT_DIR="$(dirname "$(realpath "$0")")" -PAVICS_COMPOSE="$(realpath "${CUR_SCRIPT_DIR}/../../pavics-compose.sh")" PAVICS_LOG_DIR="${PAVICS_LOG_DIR:-/tmp/pavics-compose}" CELERY_HEALTHCHECK="/opt/local/bin/weaver/celery-healthcheck" mkdir -p "${PAVICS_LOG_DIR}" # note: use 'tee' instead of capturing in variable to allow displaying results directly when running command -${PAVICS_COMPOSE} exec weaver bash "${CELERY_HEALTHCHECK}" | tee "${PAVICS_LOG_DIR}/weaver.log" +docker exec weaver bash "${CELERY_HEALTHCHECK}" | tee "${PAVICS_LOG_DIR}/weaver.log" ret_weaver=$? out_weaver=$(cat "${PAVICS_LOG_DIR}/weaver.log" | tail -n 1 | grep -c "ERROR") -${PAVICS_COMPOSE} exec weaver-worker bash "${CELERY_HEALTHCHECK}" | tee "${PAVICS_LOG_DIR}/weaver-worker.log" +docker exec weaver-worker bash "${CELERY_HEALTHCHECK}" | tee "${PAVICS_LOG_DIR}/weaver-worker.log" ret_worker=$? out_worker=$(cat "${PAVICS_LOG_DIR}/weaver-worker.log" | tail -n 1 | grep -c "ERROR") if [ ${ret_weaver} -ne 0 ] || [ ${ret_worker} -ne 0 ] || [ "${out_weaver}" -ne 0 ] || [ "${out_worker}" -ne 0 ]; then echo "${PREFIX}Weaver WebApp and/or Worker Celery tasks were not ready. Restarting both..." - ${PAVICS_COMPOSE} restart weaver weaver-worker + docker restart weaver weaver-worker else echo "${PREFIX}Weaver WebApp and/or Worker Celery tasks are both ready." fi diff --git a/birdhouse/config/canarie-api/.gitignore b/birdhouse/config/canarie-api/.gitignore deleted file mode 100644 index 76b3f6de7..000000000 --- a/birdhouse/config/canarie-api/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -docker_configuration.py -config/canarie-api/conf.extra-service.d/canarie-api.conf - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/conf.extra-service.d/canarie-api.conf -conf.extra-service.d/canarie-api.conf diff --git a/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml b/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml index 173baf53b..4297c45fa 100644 --- a/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/canarie-api/config/proxy/docker-compose-extra.yml @@ -2,9 +2,9 @@ version: "3.4" services: proxy: volumes: - - ./config/canarie-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/canarie-api:ro - - ./config/canarie-api/docker_configuration.py:/config/docker_configuration.py - - ./config/canarie-api/entrypoint:/entrypoint:ro + - ./canarie-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/canarie-api:ro + - ./canarie-api/docker_configuration.py:/config/docker_configuration.py + - ./canarie-api/entrypoint:/entrypoint:ro environment: CANARIE_API_CONFIG_FN: /config/docker_configuration.py CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR} diff --git a/birdhouse/config/finch/.gitignore b/birdhouse/config/finch/.gitignore deleted file mode 100644 index e6f9bf889..000000000 --- a/birdhouse/config/finch/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -wps.cfg -config/magpie/providers.cfg -config/canarie-api/canarie_api_monitoring.py -service-config.json - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml index 94f648a3e..e06996238 100644 --- a/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/finch/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro + - ./finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/finch/config/magpie/docker-compose-extra.yml b/birdhouse/config/finch/config/magpie/docker-compose-extra.yml index 91381eb64..0b9a050c0 100644 --- a/birdhouse/config/finch/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/finch/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./config/finch/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/finch-providers.cfg:ro + - ./finch/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/finch-providers.cfg:ro diff --git a/birdhouse/config/finch/docker-compose-extra.yml b/birdhouse/config/finch/docker-compose-extra.yml index 4e751c54c..21970c7a2 100644 --- a/birdhouse/config/finch/docker-compose-extra.yml +++ b/birdhouse/config/finch/docker-compose-extra.yml @@ -16,7 +16,7 @@ services: HTTP_PORT: 5000 PYWPS_CFG: /wps.cfg volumes: - - ./config/finch/wps.cfg:/wps.cfg + - ./finch/wps.cfg:/wps.cfg # - data:/opt/birdhouse/var/lib - /tmp restart: always diff --git a/birdhouse/config/geoserver/.gitignore b/birdhouse/config/geoserver/.gitignore deleted file mode 100644 index 190f04012..000000000 --- a/birdhouse/config/geoserver/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -config/proxy/conf.extra-service.d/geoserver.conf -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg -service-config.json - -# Old paths. Keep these so that old config files remain uncommittable after updates. -geoserver_canarie_api_monitoring.py -geoserver-magpie-provider.cfg -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml index 88f777636..fe9b54ee5 100644 --- a/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/geoserver/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro + - ./geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml b/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml index de0a96d6b..df269ed35 100644 --- a/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/geoserver/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./config/geoserver/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/geoserver-providers.cfg:ro + - ./geoserver/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/geoserver-providers.cfg:ro diff --git a/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml b/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml index 53c5ff3a1..706112ec3 100644 --- a/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/geoserver/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/geoserver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/geoserver:ro + - ./geoserver/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/geoserver:ro diff --git a/birdhouse/config/hummingbird/.gitignore b/birdhouse/config/hummingbird/.gitignore deleted file mode 100644 index cadf22493..000000000 --- a/birdhouse/config/hummingbird/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg -custom.cfg -service-config.json diff --git a/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml index 4b1c29405..8b9a2c594 100644 --- a/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/hummingbird/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro + - ./hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml b/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml index cbf5eb312..93d96cf1e 100644 --- a/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/hummingbird/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./config/hummingbird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/hummingbird-providers.cfg:ro + - ./hummingbird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/hummingbird-providers.cfg:ro diff --git a/birdhouse/config/hummingbird/docker-compose-extra.yml b/birdhouse/config/hummingbird/docker-compose-extra.yml index 965b77064..98a66e368 100644 --- a/birdhouse/config/hummingbird/docker-compose-extra.yml +++ b/birdhouse/config/hummingbird/docker-compose-extra.yml @@ -14,7 +14,7 @@ services: environment: HOSTNAME: $HOSTNAME volumes: - - ./config/hummingbird/custom.cfg:/opt/birdhouse/src/hummingbird/custom.cfg + - ./hummingbird/custom.cfg:/opt/birdhouse/src/hummingbird/custom.cfg depends_on: - postgres restart: always diff --git a/birdhouse/config/jupyterhub/.gitignore b/birdhouse/config/jupyterhub/.gitignore deleted file mode 100644 index 6563f9518..000000000 --- a/birdhouse/config/jupyterhub/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -custom_templates/login.html -jupyterhub_config.py -config/proxy/conf.extra-service.d/jupyterhub.conf -config/canarie-api/canarie_api_monitoring.py -service-config.json - -# Old paths. Keep these so that old config files remain uncommittable after updates. -jupyterhub_canarie_api_monitoring.py -config/proxy/canarie_api_monitoring.py \ No newline at end of file diff --git a/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml index 08aa88ca6..afff5aae4 100644 --- a/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/jupyterhub/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro + - ./jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml b/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml index 4c2d38127..265ccf76e 100644 --- a/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/jupyterhub/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/jupyterhub/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/jupyterhub:ro + - ./jupyterhub/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/jupyterhub:ro diff --git a/birdhouse/config/jupyterhub/custom_templates/.gitignore b/birdhouse/config/jupyterhub/custom_templates/.gitignore deleted file mode 100644 index 31d31654b..000000000 --- a/birdhouse/config/jupyterhub/custom_templates/.gitignore +++ /dev/null @@ -1 +0,0 @@ -login.html diff --git a/birdhouse/config/jupyterhub/docker-compose-extra.yml b/birdhouse/config/jupyterhub/docker-compose-extra.yml index e2a489590..2071df085 100644 --- a/birdhouse/config/jupyterhub/docker-compose-extra.yml +++ b/birdhouse/config/jupyterhub/docker-compose-extra.yml @@ -28,13 +28,11 @@ services: USER_WORKSPACE_UID: ${USER_WORKSPACE_UID} USER_WORKSPACE_GID: ${USER_WORKSPACE_GID} volumes: - - ./config/jupyterhub/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro - - ./config/jupyterhub/custom_templates:/custom_templates:ro + - ./jupyterhub/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py:ro + - ./jupyterhub/custom_templates:/custom_templates:ro - ${JUPYTERHUB_USER_DATA_DIR}:${JUPYTERHUB_USER_DATA_DIR} - jupyterhub_data_persistence:/persist:rw - /var/run/docker.sock:/var/run/docker.sock:rw - links: - - magpie networks: # ensure Hub and Notebook servers are on the same network 'jupyterhub_network' # the Hub and the rest of the stack are on network 'default' diff --git a/birdhouse/config/magpie/.gitignore b/birdhouse/config/magpie/.gitignore deleted file mode 100644 index 9d7a80452..000000000 --- a/birdhouse/config/magpie/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -magpie.ini -permissions.cfg -providers.cfg -postgres-credentials.env -docker-entrypoint-initdb.d/create-db.sql -config/proxy/conf.extra-service.d/magpie.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -magpie_canarie_api_monitoring.py -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml index c5f94a305..6a14229db 100644 --- a/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/magpie/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro + - ./magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml b/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml index 763a6da9d..ad5a08afc 100644 --- a/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/magpie/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/magpie/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/magpie:ro + - ./magpie/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/magpie:ro diff --git a/birdhouse/config/magpie/docker-compose-extra.yml b/birdhouse/config/magpie/docker-compose-extra.yml index 398cd7832..980db2ddb 100644 --- a/birdhouse/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/magpie/docker-compose-extra.yml @@ -23,16 +23,16 @@ services: MAGPIE_PORT: 2001 FORWARDED_ALLOW_IPS: "*" env_file: - - ./config/magpie/postgres-credentials.env + - ./magpie/postgres-credentials.env depends_on: - postgres-magpie links: - postgres-magpie volumes: - - ./config/magpie/postgres-credentials.env:/opt/local/src/magpie/env/postgres.env - - ./config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/providers.cfg - - ./config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/permissions.cfg - - ./config/magpie/magpie.ini:/opt/local/src/magpie/config/magpie.ini + - ./magpie/postgres-credentials.env:/opt/local/src/magpie/env/postgres.env + - ./magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/providers.cfg + - ./magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/permissions.cfg + - ./magpie/magpie.ini:/opt/local/src/magpie/config/magpie.ini restart: always logging: *default-logging @@ -41,11 +41,11 @@ services: container_name: postgres-magpie # ports: # should not be exposed directly, enable 'optional-components/database-external-ports' as needed env_file: - - ./config/magpie/postgres-credentials.env + - ./magpie/postgres-credentials.env environment: PGDATA: /var/lib/postgresql/data/pgdata volumes: - ${MAGPIE_PERSIST_DIR}:/var/lib/postgresql/data/pgdata - - ./config/magpie/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d + - ./magpie/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d restart: always logging: *default-logging diff --git a/birdhouse/config/portainer/.gitignore b/birdhouse/config/portainer/.gitignore deleted file mode 100644 index 3e9413b58..000000000 --- a/birdhouse/config/portainer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config/proxy/conf.extra-service.d/portainer.conf diff --git a/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml b/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml index a03465d8f..d6f7f15d5 100644 --- a/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/portainer/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/portainer/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/portainer:ro + - ./portainer/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/portainer:ro diff --git a/birdhouse/config/postgres/.gitignore b/birdhouse/config/postgres/.gitignore deleted file mode 100644 index 983353b4d..000000000 --- a/birdhouse/config/postgres/.gitignore +++ /dev/null @@ -1 +0,0 @@ -credentials.env diff --git a/birdhouse/config/postgres/docker-compose-extra.yml b/birdhouse/config/postgres/docker-compose-extra.yml index db004bf7f..8bf59b33c 100644 --- a/birdhouse/config/postgres/docker-compose-extra.yml +++ b/birdhouse/config/postgres/docker-compose-extra.yml @@ -14,11 +14,11 @@ services: # ports: # should not be exposed directly, enable 'optional-components/database-external-ports' as needed volumes: - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/data/pgdata - - ./config/postgres/postgres-setup.sh:/postgres-setup.sh + - ./postgres/postgres-setup.sh:/postgres-setup.sh environment: PGDATA: /var/lib/postgresql/data/pgdata POSTGRES_DATABASES_TO_CREATE: ${POSTGRES_DATABASES_TO_CREATE} env_file: - - ./config/postgres/credentials.env + - ./postgres/credentials.env restart: always logging: *default-logging diff --git a/birdhouse/config/proxy/.gitignore b/birdhouse/config/proxy/.gitignore deleted file mode 100644 index c2bb0d35d..000000000 --- a/birdhouse/config/proxy/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -conf.d/frontend.conf -conf.d/all-services.include -nginx.conf -static/ diff --git a/birdhouse/config/proxy/conf.d/.gitignore b/birdhouse/config/proxy/conf.d/.gitignore deleted file mode 100644 index b4a499ba4..000000000 --- a/birdhouse/config/proxy/conf.d/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -frontend.conf -all-services.include - -# from private config -lb_catalog.conf -lb_emu.conf -lb_flyingpigeon.conf -lb_malleefowl.conf -lb_ncops.conf diff --git a/birdhouse/config/proxy/default.env b/birdhouse/config/proxy/default.env index 65e21656e..55e2d62dd 100644 --- a/birdhouse/config/proxy/default.env +++ b/birdhouse/config/proxy/default.env @@ -17,14 +17,6 @@ export DELAYED_EVAL=" INCLUDE_FOR_PORT_80 " -# add any new variables not already in 'VARS' or 'OPTIONAL_VARS' that must be replaced in templates here -export VARS=" - $VARS - \$BIRDHOUSE_DEPLOY_COMPONENTS_JSON - \$BIRDHOUSE_DEPLOY_SERVICES_JSON - \$BIRDHOUSE_VERSION_JSON -" - export OPTIONAL_VARS=" $OPTIONAL_VARS \$INCLUDE_FOR_PORT_80 diff --git a/birdhouse/config/proxy/docker-compose-extra.yml b/birdhouse/config/proxy/docker-compose-extra.yml index dfa629e68..6eff3d1a9 100644 --- a/birdhouse/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/proxy/docker-compose-extra.yml @@ -15,10 +15,10 @@ services: - "80:80" - "443:${PROXY_SECURE_PORT}" volumes: - - ./config/proxy/conf.d:/etc/nginx/conf.d - - ./config/proxy/nginx.conf:/etc/nginx/nginx.conf + - ./proxy/conf.d:/etc/nginx/conf.d + - ./proxy/nginx.conf:/etc/nginx/nginx.conf - ${SSL_CERTIFICATE}:/etc/nginx/cert.pem - - ./config/proxy/static:/static + - ./proxy/static:/static environment: # https://github.com/bird-house/birdhouse-deploy/issues/198 REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt diff --git a/birdhouse/config/raven/.gitignore b/birdhouse/config/raven/.gitignore deleted file mode 100644 index e894caebf..000000000 --- a/birdhouse/config/raven/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg -wps.cfg -service-config.json - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml index d0d300e97..421c9ce54 100644 --- a/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/raven/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro + - ./raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/raven/config/magpie/docker-compose-extra.yml b/birdhouse/config/raven/config/magpie/docker-compose-extra.yml index b870df7a2..f554afd6d 100644 --- a/birdhouse/config/raven/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/raven/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./config/raven/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/raven-providers.cfg:ro + - ./raven/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/raven-providers.cfg:ro diff --git a/birdhouse/config/raven/docker-compose-extra.yml b/birdhouse/config/raven/docker-compose-extra.yml index 920f1b6dc..0a726598d 100644 --- a/birdhouse/config/raven/docker-compose-extra.yml +++ b/birdhouse/config/raven/docker-compose-extra.yml @@ -15,7 +15,7 @@ services: PYWPS_CFG: /wps.cfg GEO_URL: "${RAVEN_GEO_URL}" volumes: - - ./config/raven/wps.cfg:/wps.cfg + - ./raven/wps.cfg:/wps.cfg - /tmp restart: always logging: *default-logging diff --git a/birdhouse/config/thredds/.gitignore b/birdhouse/config/thredds/.gitignore deleted file mode 100644 index d3aea6bf5..000000000 --- a/birdhouse/config/thredds/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -catalog.xml -threddsConfig.xml -config/proxy/conf.extra-service.d/thredds.conf -config/canarie-api/canarie_api_monitoring.py -service-config.json -config/magpie/providers.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml index 1a50cc3d0..7c260933c 100644 --- a/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/thredds/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro + - ./thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml b/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml index 0d9a26632..054e81f97 100644 --- a/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml +++ b/birdhouse/config/thredds/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./config/thredds/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/thredds-providers.cfg:ro + - ./thredds/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/thredds-providers.cfg:ro diff --git a/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml b/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml index 6bcb99497..9258da5e3 100644 --- a/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/thredds/config/proxy/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./config/thredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/thredds:ro + - ./thredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/thredds:ro links: - thredds diff --git a/birdhouse/config/thredds/docker-compose-extra.yml b/birdhouse/config/thredds/docker-compose-extra.yml index 8ae7735e9..a3feb4da2 100644 --- a/birdhouse/config/thredds/docker-compose-extra.yml +++ b/birdhouse/config/thredds/docker-compose-extra.yml @@ -12,7 +12,7 @@ services: image: ${THREDDS_IMAGE} container_name: thredds env_file: - - ./config/thredds/thredds.env + - ./thredds/thredds.env environment: # for reconstructing proper URL back to user when Thredds behind proxy # because Twitcher eats the "Host" http header set by Nginx @@ -22,10 +22,10 @@ services: - ${DATA_PERSIST_ROOT}/datasets:/pavics-data - ${DATA_PERSIST_ROOT}/ncml:/pavics-ncml - wps_outputs:/pavics-data/wps_outputs - - ./config/thredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro - - ./config/thredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro - - ./config/thredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro - - ./config/thredds/entrypointwrapper:/entrypointwrapper:ro + - ./thredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro + - ./thredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro + - ./thredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro + - ./thredds/entrypointwrapper:/entrypointwrapper:ro entrypoint: /entrypointwrapper restart: always logging: *default-logging diff --git a/birdhouse/config/twitcher/.gitignore b/birdhouse/config/twitcher/.gitignore deleted file mode 100644 index ac6ff8fc2..000000000 --- a/birdhouse/config/twitcher/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -twitcher.ini -config/proxy/conf.extra-service.d/twitcher.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml index 44335000d..0e8e1550c 100644 --- a/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/twitcher/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro + - ./twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml b/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml index a03dcd41a..2ebd8a334 100644 --- a/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/twitcher/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/twitcher/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/twitcher:ro + - ./twitcher/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/twitcher:ro diff --git a/birdhouse/config/twitcher/docker-compose-extra.yml b/birdhouse/config/twitcher/docker-compose-extra.yml index 0fd79afaa..d4719451b 100644 --- a/birdhouse/config/twitcher/docker-compose-extra.yml +++ b/birdhouse/config/twitcher/docker-compose-extra.yml @@ -20,14 +20,14 @@ services: # Other Magpie components are unknown and ignored by Twitcher itself. MAGPIE_PROVIDERS_CONFIG_PATH: "/opt/birdhouse/src/magpie/config" env_file: - - ./config/magpie/postgres-credentials.env + - ./magpie/postgres-credentials.env depends_on: - postgres-magpie - magpie links: - postgres-magpie volumes: - - ./config/twitcher/twitcher.ini:/opt/birdhouse/src/twitcher/twitcher.ini + - ./twitcher/twitcher.ini:/opt/birdhouse/src/twitcher/twitcher.ini command: "pserve /opt/birdhouse/src/twitcher/twitcher.ini" restart: always logging: *default-logging diff --git a/birdhouse/config/wps_outputs-volume/.gitignore b/birdhouse/config/wps_outputs-volume/.gitignore deleted file mode 100644 index 000178019..000000000 --- a/birdhouse/config/wps_outputs-volume/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config/proxy/conf.extra-service.d/wps_outputs-volume.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml index d95b8a227..f6b202d60 100644 --- a/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./config/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/wps_outputs-volume_canarie_api_monitoring.py:ro + - ./wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/wps_outputs-volume_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml b/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml index 5d2378963..225e85495 100644 --- a/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml +++ b/birdhouse/config/wps_outputs-volume/config/proxy/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: proxy: volumes: - - ./config/wps_outputs-volume/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/wps_outputs-volume:ro + - ./wps_outputs-volume/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/wps_outputs-volume:ro - wps_outputs:/pavics-data/wps_outputs diff --git a/birdhouse/default.env b/birdhouse/default.env index 086885ca3..d8594d26b 100644 --- a/birdhouse/default.env +++ b/birdhouse/default.env @@ -6,6 +6,8 @@ # must use single quotes to avoid early expansion before overrides in env.local # are applied and must be added to the list of DELAYED_EVAL. +export BUILD_DIR='${COMPOSE_DIR}/build' + export BASH_IMAGE="bash:5.1.4" # Root directory under which all data persistence should be nested under @@ -29,6 +31,7 @@ export PAVICS_FQDN_PUBLIC='${PAVICS_FQDN}' export DELAYED_EVAL=" $DELAYED_EVAL PAVICS_FQDN_PUBLIC + BUILD_DIR DATA_PERSIST_SHARED_ROOT WPS_OUTPUTS_DIR " diff --git a/birdhouse/deprecated-components/catalog/.gitignore b/birdhouse/deprecated-components/catalog/.gitignore deleted file mode 100644 index 00ca57a30..000000000 --- a/birdhouse/deprecated-components/catalog/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -catalog.cfg -config/magpie/permissions.cfg -config/magpie/providers.cfg -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml index fd67d5eaf..d15e80c82 100644 --- a/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_monitoring.py:ro + - ./catalog/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml index 174f3613f..ea41bc037 100644 --- a/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/catalog/config/magpie/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: magpie: volumes: - - ./deprecated-components/catalog/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/catalog-providers.cfg:ro - - ./deprecated-components/catalog/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/catalog-permissions.cfg:ro + - ./catalog/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/catalog-providers.cfg:ro + - ./catalog/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/catalog-permissions.cfg:ro diff --git a/birdhouse/deprecated-components/catalog/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/docker-compose-extra.yml index cc2a8cbff..5510f6ace 100644 --- a/birdhouse/deprecated-components/catalog/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/catalog/docker-compose-extra.yml @@ -14,7 +14,7 @@ services: ports: - "8086:80" volumes: - - ./deprecated-components/catalog/catalog.cfg:/home/catalog.cfg + - ./catalog/catalog.cfg:/home/catalog.cfg - wps_outputs:/var/www/html/wps_results depends_on: - postgres diff --git a/birdhouse/deprecated-components/flyingpigeon/.gitignore b/birdhouse/deprecated-components/flyingpigeon/.gitignore deleted file mode 100644 index 2be797c77..000000000 --- a/birdhouse/deprecated-components/flyingpigeon/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -wps.cfg -config/canarie-api/canarie_api_monitoring.py -config/magpie/permissions.cfg -config/magpie/providers.cfg -service-config.json diff --git a/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml index 89a66084f..b9f189fab 100644 --- a/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro + - ./flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml index 549865715..1a2ae4847 100644 --- a/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: magpie: volumes: - - ./deprecated-components/flyingpigeon/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/flyingpigeon-providers.cfg:ro - - ./deprecated-components/flyingpigeon/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/flyingpigeon-permissions.cfg:ro + - ./flyingpigeon/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/flyingpigeon-providers.cfg:ro + - ./flyingpigeon/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/flyingpigeon-permissions.cfg:ro diff --git a/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml index 099f4952f..d99692ac9 100644 --- a/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml @@ -14,7 +14,7 @@ services: environment: - PYWPS_CFG=/wps.cfg volumes: - - ./deprecated-components/flyingpigeon/wps.cfg:/wps.cfg + - ./flyingpigeon/wps.cfg:/wps.cfg - /tmp depends_on: - postgres diff --git a/birdhouse/deprecated-components/frontend/.gitignore b/birdhouse/deprecated-components/frontend/.gitignore deleted file mode 100644 index c0d591a9f..000000000 --- a/birdhouse/deprecated-components/frontend/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -frontend.env -config/proxy/conf.extra-service.d/frontend.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -conf.extra-service.d/frontend.conf -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml index d45650da1..9569ce99f 100644 --- a/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/frontend_canarie_api_monitoring.py:ro + - ./frontend/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/frontend_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml index bd40798d1..3d236f3a2 100644 --- a/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/frontend/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/frontend/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/frontend:ro + - ./frontend/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/frontend:ro diff --git a/birdhouse/deprecated-components/frontend/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/docker-compose-extra.yml index b987e342e..1f131ff1c 100644 --- a/birdhouse/deprecated-components/frontend/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/frontend/docker-compose-extra.yml @@ -14,6 +14,6 @@ services: ports: - "3000:3000" env_file: - - ./deprecated-components/frontend/frontend.env + - ./frontend/frontend.env restart: always logging: *default-logging diff --git a/birdhouse/deprecated-components/malleefowl/.gitignore b/birdhouse/deprecated-components/malleefowl/.gitignore deleted file mode 100644 index ff3e23e10..000000000 --- a/birdhouse/deprecated-components/malleefowl/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -custom.cfg -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -malleefowl_canarie_api_monitoring.py -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml index dfdbb10fe..054fbaad4 100644 --- a/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_monitoring.py:ro + - ./malleefowl/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml index 87f2fc433..783e8c67c 100644 --- a/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/malleefowl/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./deprecated-components/malleefowl/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/malleefowl-providers.cfg:ro + - ./malleefowl/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/malleefowl-providers.cfg:ro diff --git a/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml index 8babd5f43..30a955b46 100644 --- a/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/malleefowl/docker-compose-extra.yml @@ -24,7 +24,7 @@ services: - "48091:9001" volumes: - ${DATA_PERSIST_ROOT}/datasets:/pavics-data - - ./deprecated-components/malleefowl/custom.cfg:/opt/birdhouse/src/malleefowl/custom.cfg + - ./malleefowl/custom.cfg:/opt/birdhouse/src/malleefowl/custom.cfg depends_on: - postgres restart: always diff --git a/birdhouse/deprecated-components/ncops/.gitignore b/birdhouse/deprecated-components/ncops/.gitignore deleted file mode 100644 index 8093211e5..000000000 --- a/birdhouse/deprecated-components/ncops/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ncops.cfg diff --git a/birdhouse/deprecated-components/ncwms2/.gitignore b/birdhouse/deprecated-components/ncwms2/.gitignore deleted file mode 100644 index 1698daf19..000000000 --- a/birdhouse/deprecated-components/ncwms2/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -custom.cfg -config/proxy/conf.extra-service.d/ncwms2.conf -config/magpie/providers.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -ncwms2-magpie-provider.cfg - diff --git a/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml index 7d26bc5fc..c144e803f 100644 --- a/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/ncwms2/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./deprecated-components/ncwms2/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/ncwms2-providers.cfg:ro + - ./ncwms2/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/ncwms2-providers.cfg:ro diff --git a/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml index ff00e6799..fdcb44b00 100644 --- a/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/ncwms2/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/ncwms2/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/ncwms2:ro + - ./ncwms2/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/ncwms2:ro diff --git a/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml b/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml index 46c797fc1..99c087461 100644 --- a/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/ncwms2/docker-compose-extra.yml @@ -13,7 +13,7 @@ services: container_name: ncwms2 volumes: - ${DATA_PERSIST_ROOT}/datasets:/pavics-data - - ./deprecated-components/ncwms2/custom.cfg:/opt/birdhouse/custom.cfg - - ./deprecated-components/ncwms2/server.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.tomcat-0.2.9-py2.7.egg/birdhousebuilder/recipe/tomcat/server.xml + - ./ncwms2/custom.cfg:/opt/birdhouse/custom.cfg + - ./ncwms2/server.xml:/opt/birdhouse/eggs/birdhousebuilder.recipe.tomcat-0.2.9-py2.7.egg/birdhousebuilder/recipe/tomcat/server.xml restart: always logging: *default-logging diff --git a/birdhouse/deprecated-components/phoenix/.gitignore b/birdhouse/deprecated-components/phoenix/.gitignore deleted file mode 100644 index b89cbfc6b..000000000 --- a/birdhouse/deprecated-components/phoenix/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -custom.cfg -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml index dd3413d37..b607af94f 100644 --- a/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/phoenix_canarie_api_monitoring.py:ro + - ./phoenix/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/phoenix_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml b/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml index 2205263ec..4d24a2c6a 100644 --- a/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/phoenix/docker-compose-extra.yml @@ -22,7 +22,7 @@ services: - "38443:38443" - "9001:9001" volumes: - - ./deprecated-components/phoenix/custom.cfg:/opt/birdhouse/src/phoenix/custom.cfg + - ./phoenix/custom.cfg:/opt/birdhouse/src/phoenix/custom.cfg - ${SSL_CERTIFICATE}:/opt/birdhouse/etc/nginx/cert.pem links: - mongodb diff --git a/birdhouse/deprecated-components/project-api/.gitignore b/birdhouse/deprecated-components/project-api/.gitignore deleted file mode 100644 index 5ff9ca1ca..000000000 --- a/birdhouse/deprecated-components/project-api/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config/proxy/conf.extra-service.d/project-api.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml index 264d0b840..0d01e135b 100644 --- a/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/project-api_canarie_api_monitoring.py:ro + - ./project-api/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/project-api_canarie_api_monitoring.py:ro diff --git a/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml index 295012598..78e21dee8 100644 --- a/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/project-api/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/project-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/project-api:ro + - ./project-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/project-api:ro diff --git a/birdhouse/deprecated-components/project-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/docker-compose-extra.yml index 3f3545f82..4664a69b2 100644 --- a/birdhouse/deprecated-components/project-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/project-api/docker-compose-extra.yml @@ -18,6 +18,6 @@ services: links: - postgres env_file: - - ./config/postgres/credentials.env + - ./postgres/credentials.env restart: always logging: *default-logging diff --git a/birdhouse/deprecated-components/solr/.gitignore b/birdhouse/deprecated-components/solr/.gitignore deleted file mode 100644 index 274fb5ded..000000000 --- a/birdhouse/deprecated-components/solr/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml index 13d31a9b9..142abd87a 100644 --- a/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro + - ./solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example index df68cb4b7..2689ce053 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -36,6 +36,13 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # Optional vars ############################################################################# +# Build directory. Files used to deploy the birdhouse stack will be generated +# and written to this directory. Default is: ./birdhouse/build/ +# +# WARNING: this directory will be destroyed and recreated every time so do not +# choose a directory on disk that already exists and is non-empty +#export BUILD_DIR=/some/build/directory + # Extra dirs possibly containing: # * `docker-compose-extra.yml` file to override the default docker-compose.yml file # * `default.env` file to provide extra defaults for each component diff --git a/birdhouse/optional-components/all-public-access/config/catalog/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/catalog/docker-compose-extra.yml index 7f39a5621..46dcc0e32 100644 --- a/birdhouse/optional-components/all-public-access/config/catalog/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/catalog/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/catalog/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-catalog-permissions.cfg:ro + - ./all-public-access/config/catalog/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-catalog-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/finch/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/finch/docker-compose-extra.yml index 9f32b4ace..2f081d451 100644 --- a/birdhouse/optional-components/all-public-access/config/finch/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/finch/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/finch/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-finch-permissions.cfg:ro + - ./all-public-access/config/finch/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-finch-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/flyingpigeon/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/flyingpigeon/docker-compose-extra.yml index 14dfbd538..9556b717c 100644 --- a/birdhouse/optional-components/all-public-access/config/flyingpigeon/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/flyingpigeon/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/flyingpigeon/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-flyingpigeon-permissions.cfg:ro + - ./all-public-access/config/flyingpigeon/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-flyingpigeon-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/hummingbird/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/hummingbird/docker-compose-extra.yml index 3ab0f1969..d5f99b0a3 100644 --- a/birdhouse/optional-components/all-public-access/config/hummingbird/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/hummingbird/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/hummingbird/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-hummingbird-permissions.cfg:ro + - ./all-public-access/config/hummingbird/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-hummingbird-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/malleefowl/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/malleefowl/docker-compose-extra.yml index 8328d5a48..f1b4c4ab1 100644 --- a/birdhouse/optional-components/all-public-access/config/malleefowl/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/malleefowl/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/malleefowl/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-malleefowl-permissions.cfg:ro + - ./all-public-access/config/malleefowl/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-malleefowl-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/ncwms2/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/ncwms2/docker-compose-extra.yml index 5c9ec6155..e7ec167e1 100644 --- a/birdhouse/optional-components/all-public-access/config/ncwms2/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/ncwms2/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/ncwms2/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-ncwms2-permissions.cfg:ro + - ./all-public-access/config/ncwms2/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-ncwms2-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/raven/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/raven/docker-compose-extra.yml index 022ad375b..87bcece7e 100644 --- a/birdhouse/optional-components/all-public-access/config/raven/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/raven/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/raven/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-raven-permissions.cfg:ro + - ./all-public-access/config/raven/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-raven-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/secure-data-proxy/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/secure-data-proxy/docker-compose-extra.yml index 61020bca7..1b3bc9120 100644 --- a/birdhouse/optional-components/all-public-access/config/secure-data-proxy/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/secure-data-proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/secure-data-proxy/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-secure-data-proxy-permissions.cfg:ro + - ./all-public-access/config/secure-data-proxy/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-secure-data-proxy-permissions.cfg:ro diff --git a/birdhouse/optional-components/all-public-access/config/thredds/docker-compose-extra.yml b/birdhouse/optional-components/all-public-access/config/thredds/docker-compose-extra.yml index 7c973d81a..fe54bf7b7 100644 --- a/birdhouse/optional-components/all-public-access/config/thredds/docker-compose-extra.yml +++ b/birdhouse/optional-components/all-public-access/config/thredds/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/all-public-access/config/thredds/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-thredds-permissions.cfg:ro + - ./all-public-access/config/thredds/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/all-public-access-thredds-permissions.cfg:ro diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore deleted file mode 100644 index c8e7680db..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Old paths. Keep these so that old config files remain uncommittable after updates. -canarie_api_full_monitoring.py -config/proxy/canarie_api_full_monitoring.py -config/canarie-api/canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore deleted file mode 100644 index 4a4930385..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Old paths. Keep these so that old config files remain uncommittable after updates. -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml index b41e0108a..2d13d12f7 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/canarie-api/docker-compose-extra.yml @@ -2,7 +2,7 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/canarie-api/a_demo_override_precedence.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/a_demo_override_precedence.py:ro - - ./optional-components/canarie-api-full-monitoring/config/canarie-api/z_demo_only_py_file_are_loaded.wrongsuffix:${CANARIE_MONITORING_EXTRA_CONF_DIR}/z_demo_only_py_file_are_loaded.wrongsuffix:ro + - ./canarie-api-full-monitoring/config/canarie-api/a_demo_override_precedence.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/a_demo_override_precedence.py:ro + - ./canarie-api-full-monitoring/config/canarie-api/z_demo_only_py_file_are_loaded.wrongsuffix:${CANARIE_MONITORING_EXTRA_CONF_DIR}/z_demo_only_py_file_are_loaded.wrongsuffix:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml index efd03784c..5acc6e3df 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/catalog/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/catalog/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml index 35dca0a1d..984fb2da7 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/cowbird/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/cowbird_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/cowbird_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml index 911a52f47..1b10ffc46 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/finch/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/finch/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml index fd77c0c34..3347feeac 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/hummingbird/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/hummingbird/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml index 2406bff9d..e6156b966 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/malleefowl/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/malleefowl/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml index 80999e95c..cd6af714d 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/ncwms2/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/ncwms2_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/ncwms2/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/ncwms2_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml index 1062b6cd7..3fb7cc72d 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/raven/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/raven/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml index 611e41f0c..39cd785a8 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/thredds/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore deleted file mode 100644 index de66237e8..000000000 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -canarie_api_full_monitoring.py diff --git a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml index 1e8ff5f33..6bfd1bf0b 100644 --- a/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml +++ b/birdhouse/optional-components/canarie-api-full-monitoring/config/weaver/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/weaver_canarie_api_full_monitoring.py:ro + - ./canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/weaver_canarie_api_full_monitoring.py:ro # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2 diff --git a/birdhouse/optional-components/emu/.gitignore b/birdhouse/optional-components/emu/.gitignore deleted file mode 100644 index ffcdbfa83..000000000 --- a/birdhouse/optional-components/emu/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -wps.cfg -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg -config/magpie/permissions.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -emu-magpie-permission.cfg -emu-magpie-provider.cfg -emu_canarie_api_monitoring.py -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/optional-components/emu/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/emu/config/canarie-api/docker-compose-extra.yml index 2c658022b..23b6d2b1c 100644 --- a/birdhouse/optional-components/emu/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/optional-components/emu/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/emu/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/emu_canarie_api_monitoring.py:ro + - ./emu/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/emu_canarie_api_monitoring.py:ro diff --git a/birdhouse/optional-components/emu/config/magpie/docker-compose-extra.yml b/birdhouse/optional-components/emu/config/magpie/docker-compose-extra.yml index a5bf6eae6..be2869dd1 100644 --- a/birdhouse/optional-components/emu/config/magpie/docker-compose-extra.yml +++ b/birdhouse/optional-components/emu/config/magpie/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/emu/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/emu-permissions.cfg:ro - - ./optional-components/emu/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/emu-providers.cfg:ro + - ./emu/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/emu-permissions.cfg:ro + - ./emu/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/emu-providers.cfg:ro diff --git a/birdhouse/optional-components/emu/docker-compose-extra.yml b/birdhouse/optional-components/emu/docker-compose-extra.yml index 1fdad42e8..d14319054 100644 --- a/birdhouse/optional-components/emu/docker-compose-extra.yml +++ b/birdhouse/optional-components/emu/docker-compose-extra.yml @@ -6,7 +6,7 @@ services: environment: - PYWPS_CFG=/wps.cfg volumes: - - ./optional-components/emu/wps.cfg:/wps.cfg + - ./emu/wps.cfg:/wps.cfg - ${EMU_WPS_OUTPUTS_VOL}:/data/wpsoutputs - /tmp restart: always diff --git a/birdhouse/optional-components/generic_bird/.gitignore b/birdhouse/optional-components/generic_bird/.gitignore deleted file mode 100644 index 529803948..000000000 --- a/birdhouse/optional-components/generic_bird/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -wps.cfg -postgres/credentials.env -config/canarie-api/canarie_api_monitoring.py -config/magpie/providers.cfg -config/magpie/permissions.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -generic_bird-magpie-permission.cfg -generic_bird-magpie-provider.cfg -generic_bird_canarie_api_monitoring.py -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/optional-components/generic_bird/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/generic_bird/config/canarie-api/docker-compose-extra.yml index dadd099d3..0afe45eb4 100644 --- a/birdhouse/optional-components/generic_bird/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/optional-components/generic_bird/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/generic_bird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/generic_bird_canarie_api_monitoring.py:ro + - ./generic_bird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/generic_bird_canarie_api_monitoring.py:ro diff --git a/birdhouse/optional-components/generic_bird/config/magpie/docker-compose-extra.yml b/birdhouse/optional-components/generic_bird/config/magpie/docker-compose-extra.yml index 5bde0c9f3..0782b1963 100644 --- a/birdhouse/optional-components/generic_bird/config/magpie/docker-compose-extra.yml +++ b/birdhouse/optional-components/generic_bird/config/magpie/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/generic_bird/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/generic_bird-permissions.cfg:ro - - ./optional-components/generic_bird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/generic_bird-providers.cfg:ro + - ./generic_bird/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/generic_bird-permissions.cfg:ro + - ./generic_bird/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/generic_bird-providers.cfg:ro diff --git a/birdhouse/optional-components/generic_bird/docker-compose-extra.yml b/birdhouse/optional-components/generic_bird/docker-compose-extra.yml index 6e4cd4460..bf5bc87cf 100644 --- a/birdhouse/optional-components/generic_bird/docker-compose-extra.yml +++ b/birdhouse/optional-components/generic_bird/docker-compose-extra.yml @@ -6,7 +6,7 @@ services: environment: PYWPS_CFG: /wps.cfg volumes: - - ./optional-components/generic_bird/wps.cfg:/wps.cfg:ro + - ./generic_bird/wps.cfg:/wps.cfg:ro - /tmp links: - postgres_generic_bird @@ -17,11 +17,11 @@ services: container_name: postgres_generic_bird volumes: - postgres_generic_bird:/var/lib/postgresql/data/pgdata - - ./optional-components/generic_bird/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d + - ./generic_bird/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d environment: PGDATA: /var/lib/postgresql/data/pgdata env_file: - - ./config/postgres/credentials.env + - ./postgres/credentials.env restart: always volumes: diff --git a/birdhouse/optional-components/generic_bird/postgres/.gitignore b/birdhouse/optional-components/generic_bird/postgres/.gitignore deleted file mode 100644 index 983353b4d..000000000 --- a/birdhouse/optional-components/generic_bird/postgres/.gitignore +++ /dev/null @@ -1 +0,0 @@ -credentials.env diff --git a/birdhouse/optional-components/secure-data-proxy/.gitignore b/birdhouse/optional-components/secure-data-proxy/.gitignore deleted file mode 100644 index f0f42d9a3..000000000 --- a/birdhouse/optional-components/secure-data-proxy/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config/proxy/conf.extra-service.d/secure-data-auth.conf -config/magpie/config.yml - -# Old paths. Keep these so that old config files remain uncommittable after updates. -conf.extra-service.d/secure-data-auth.conf diff --git a/birdhouse/optional-components/secure-data-proxy/config/magpie/docker-compose-extra.yml b/birdhouse/optional-components/secure-data-proxy/config/magpie/docker-compose-extra.yml index 4d711a24b..0e8ac8e99 100644 --- a/birdhouse/optional-components/secure-data-proxy/config/magpie/docker-compose-extra.yml +++ b/birdhouse/optional-components/secure-data-proxy/config/magpie/docker-compose-extra.yml @@ -2,5 +2,5 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/secure-data-proxy/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/secure-data-proxy.yml:ro - - ./optional-components/secure-data-proxy/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/secure-data-proxy.yml:ro + - ./secure-data-proxy/config/magpie/config.yml:${MAGPIE_PROVIDERS_CONFIG_PATH}/secure-data-proxy.yml:ro + - ./secure-data-proxy/config/magpie/config.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/secure-data-proxy.yml:ro diff --git a/birdhouse/optional-components/secure-data-proxy/config/proxy/docker-compose-extra.yml b/birdhouse/optional-components/secure-data-proxy/config/proxy/docker-compose-extra.yml index 4efbf6ffa..1b5ba0092 100644 --- a/birdhouse/optional-components/secure-data-proxy/config/proxy/docker-compose-extra.yml +++ b/birdhouse/optional-components/secure-data-proxy/config/proxy/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/secure-data-proxy/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/secure-data-proxy:ro + - ./secure-data-proxy/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/secure-data-proxy:ro diff --git a/birdhouse/optional-components/secure-thredds/config/magpie/docker-compose-extra.yml b/birdhouse/optional-components/secure-thredds/config/magpie/docker-compose-extra.yml index b00cb2d84..c47b2f1c7 100644 --- a/birdhouse/optional-components/secure-thredds/config/magpie/docker-compose-extra.yml +++ b/birdhouse/optional-components/secure-thredds/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/secure-thredds/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/secure-thredds-permissions.cfg:ro + - ./secure-thredds/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/secure-thredds-permissions.cfg:ro diff --git a/birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml b/birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml index 6a188b184..ddce69de7 100644 --- a/birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml +++ b/birdhouse/optional-components/stac-public-access/config/magpie/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/stac-public-access/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/stac-public-access-permissions.cfg:ro + - ./stac-public-access/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/stac-public-access-permissions.cfg:ro diff --git a/birdhouse/optional-components/test-geoserver-secured-access/config/magpie/.gitignore b/birdhouse/optional-components/test-geoserver-secured-access/config/magpie/.gitignore deleted file mode 100644 index a71877c53..000000000 --- a/birdhouse/optional-components/test-geoserver-secured-access/config/magpie/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -providers.cfg -permissions.cfg - -# Old paths. Keep these so that old config files remain uncommittable after updates. -test-geoserver-providers.cfg -test-geoserver-permissions.cfg diff --git a/birdhouse/optional-components/test-geoserver-secured-access/config/proxy/conf.d/.gitignore b/birdhouse/optional-components/test-geoserver-secured-access/config/proxy/conf.d/.gitignore deleted file mode 100644 index a9a6e66b8..000000000 --- a/birdhouse/optional-components/test-geoserver-secured-access/config/proxy/conf.d/.gitignore +++ /dev/null @@ -1 +0,0 @@ -test-geoserver-secured.conf diff --git a/birdhouse/optional-components/test-geoserver-secured-access/docker-compose-extra.yml b/birdhouse/optional-components/test-geoserver-secured-access/docker-compose-extra.yml index e2337f489..523ffbf38 100644 --- a/birdhouse/optional-components/test-geoserver-secured-access/docker-compose-extra.yml +++ b/birdhouse/optional-components/test-geoserver-secured-access/docker-compose-extra.yml @@ -2,12 +2,12 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/test-geoserver-secured-access/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/test-geoserver-permissions.cfg:ro - - ./optional-components/test-geoserver-secured-access/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/test-geoserver-providers.cfg:ro + - ./test-geoserver-secured-access/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/test-geoserver-permissions.cfg:ro + - ./test-geoserver-secured-access/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/test-geoserver-providers.cfg:ro proxy: volumes: - - ./optional-components/test-geoserver-secured-access/config/proxy/conf.d/test-geoserver-secured.conf:/etc/nginx/conf.extra-service.d/geoserver-secured-service/test-geoserver-secured.conf:ro + - ./test-geoserver-secured-access/config/proxy/conf.d/test-geoserver-secured.conf:/etc/nginx/conf.extra-service.d/geoserver-secured-service/test-geoserver-secured.conf:ro geoserver: volumes: - - ./optional-components/test-geoserver-secured-access/test-data:/geoserver-test-data:ro + - ./test-geoserver-secured-access/test-data:/geoserver-test-data:ro diff --git a/birdhouse/optional-components/test-weaver/config/magpie/.gitignore b/birdhouse/optional-components/test-weaver/config/magpie/.gitignore deleted file mode 100644 index ffee6ab3f..000000000 --- a/birdhouse/optional-components/test-weaver/config/magpie/.gitignore +++ /dev/null @@ -1 +0,0 @@ -test-weaver-permissions.yml diff --git a/birdhouse/optional-components/test-weaver/config/weaver/.gitignore b/birdhouse/optional-components/test-weaver/config/weaver/.gitignore deleted file mode 100644 index e197c8331..000000000 --- a/birdhouse/optional-components/test-weaver/config/weaver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -request_options.yml diff --git a/birdhouse/optional-components/test-weaver/docker-compose-extra.yml b/birdhouse/optional-components/test-weaver/docker-compose-extra.yml index 7ba90ec90..378fd3748 100644 --- a/birdhouse/optional-components/test-weaver/docker-compose-extra.yml +++ b/birdhouse/optional-components/test-weaver/docker-compose-extra.yml @@ -2,13 +2,13 @@ version: "3.4" services: magpie: volumes: - - ./optional-components/test-weaver/config/magpie/test-weaver-permissions.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/test-weaver-permissions.yml:ro + - ./test-weaver/config/magpie/test-weaver-permissions.yml:${MAGPIE_PERMISSIONS_CONFIG_PATH}/test-weaver-permissions.yml:ro # NOTE: # This optional component must be loaded AFTER main 'weaver' component to override the files in exact destinations. weaver: volumes: - - ./optional-components/test-weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro + - ./test-weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro weaver-worker: volumes: - - ./optional-components/test-weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro + - ./test-weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro diff --git a/birdhouse/optional-components/testthredds/.gitignore b/birdhouse/optional-components/testthredds/.gitignore deleted file mode 100644 index 27ee3776d..000000000 --- a/birdhouse/optional-components/testthredds/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -catalog.xml -threddsConfig.xml -config/proxy/conf.extra-service.d/testthredds-service.conf -config/canarie-api/canarie_api_monitoring.py - -# Old paths. Keep these so that old config files remain uncommittable after updates. -testthredds_canarie_api_monitoring.py -conf.extra-service.d/ -config/proxy/canarie_api_monitoring.py diff --git a/birdhouse/optional-components/testthredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/testthredds/config/canarie-api/docker-compose-extra.yml index 585e26535..850cc27f2 100644 --- a/birdhouse/optional-components/testthredds/config/canarie-api/docker-compose-extra.yml +++ b/birdhouse/optional-components/testthredds/config/canarie-api/docker-compose-extra.yml @@ -2,4 +2,4 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/testthredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/testthredds_canarie_api_monitoring.py:ro + - ./testthredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/testthredds_canarie_api_monitoring.py:ro diff --git a/birdhouse/optional-components/testthredds/config/proxy/docker-compose-extra.yml b/birdhouse/optional-components/testthredds/config/proxy/docker-compose-extra.yml index d65c793cb..8b152d1e1 100644 --- a/birdhouse/optional-components/testthredds/config/proxy/docker-compose-extra.yml +++ b/birdhouse/optional-components/testthredds/config/proxy/docker-compose-extra.yml @@ -2,6 +2,6 @@ version: "3.4" services: proxy: volumes: - - ./optional-components/testthredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/testthredds:ro + - ./testthredds/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/testthredds:ro links: - testthredds diff --git a/birdhouse/optional-components/testthredds/docker-compose-extra.yml b/birdhouse/optional-components/testthredds/docker-compose-extra.yml index 4daa4138e..96f7f50a7 100644 --- a/birdhouse/optional-components/testthredds/docker-compose-extra.yml +++ b/birdhouse/optional-components/testthredds/docker-compose-extra.yml @@ -4,7 +4,7 @@ services: image: ${TESTTHREDDS_IMAGE} container_name: testthredds env_file: - - ./optional-components/testthredds/thredds.env + - ./testthredds/thredds.env environment: # for reconstructing proper URL back to user when Thredds behind proxy # because Twitcher eats the "Host" http header set by Nginx @@ -18,10 +18,10 @@ services: - ${DATA_PERSIST_ROOT}/ncml:/pavics-ncml:ro - testwps_outputs:/testwps_outputs:ro - wps_outputs:/pavics-data/wps_outputs:ro - - ./optional-components/testthredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro - - ./optional-components/testthredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro - - ./optional-components/testthredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro - - ./optional-components/testthredds/entrypointwrapper:/entrypointwrapper:ro + - ./testthredds/catalog.xml:/usr/local/tomcat/content/thredds/catalog.xml:ro + - ./testthredds/threddsConfig.xml:/usr/local/tomcat/content/thredds/threddsConfig.xml:ro + - ./testthredds/wmsConfig.xml:/usr/local/tomcat/content/thredds/wmsConfig.xml:ro + - ./testthredds/entrypointwrapper:/entrypointwrapper:ro entrypoint: /entrypointwrapper restart: always healthcheck: diff --git a/birdhouse/pavics-compose.sh b/birdhouse/pavics-compose.sh index 1858de2f3..67af9bbdb 100755 --- a/birdhouse/pavics-compose.sh +++ b/birdhouse/pavics-compose.sh @@ -49,10 +49,6 @@ COMPOSE_DIR="`pwd`" . "$COMPOSE_DIR/read-configs.include.sh" read_configs # this sets ALL_CONF_DIRS -. ./scripts/get-components-json.include.sh -. ./scripts/get-services-json.include.sh -. ./scripts/get-version-json.include.sh - for i in ${VARS} do v="${i}" @@ -86,30 +82,63 @@ for adir in $AUTODEPLOY_EXTRA_REPOS; do done export AUTODEPLOY_EXTRA_REPOS_AS_DOCKER_VOLUMES -# we apply all the templates -find $ALL_CONF_DIRS -name '*.template' | - while read FILE - do - DEST=${FILE%.template} - cat ${FILE} | envsubst "$VARS" | envsubst "$OPTIONAL_VARS" > ${DEST} - done +COMPOSE_FILE="${BUILD_DIR}/docker-compose.yml" + +# Keep the compose project name as "birdhouse" by default (no matter where the build directory is located) +export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-birdhouse} if [ x"$1" = x"up" ]; then + rm -r "${BUILD_DIR}" for adir in $ALL_CONF_DIRS; do + CONF_NAME="$(basename "${adir}")" + find "$adir" -type f | + while read -r FILE + do + RELATIVE_FILE_PATH=${FILE#${adir}} + DEST="${BUILD_DIR}/${CONF_NAME}/${RELATIVE_FILE_PATH#/}" + mkdir -p "$(dirname "${DEST}")" + if ! ln "${FILE}" "${DEST}"; then + echo "${YELLOW}Warning:${NORMAL} unable to link '${FILE}' to '${DEST}'. Attempting to copy instead." + cp "${FILE}" "${DEST}" + fi + done + done + + # we apply all the templates + find "$BUILD_DIR" -name '*.template' | + while read -r FILE + do + DEST=${FILE%.template} + cat "${FILE}" | envsubst "$VARS" | envsubst "$OPTIONAL_VARS" > "${DEST}" + done + + # Get the information for enabled components, services, version; after the template + # file have been written so that they reflect the most up-to-date changes. + . ./scripts/get-components-json.include.sh + . ./scripts/get-services-json.include.sh + . ./scripts/get-version-json.include.sh + + for adir in "${BUILD_DIR}"/*; do COMPONENT_PRE_COMPOSE_UP="$adir/pre-docker-compose-up" if [ -x "$COMPONENT_PRE_COMPOSE_UP" ]; then echo "executing '$COMPONENT_PRE_COMPOSE_UP'" sh -x "$COMPONENT_PRE_COMPOSE_UP" fi done -fi -create_compose_conf_list # this sets COMPOSE_CONF_LIST -echo "COMPOSE_CONF_LIST=" -echo ${COMPOSE_CONF_LIST} | tr ' ' '\n' | grep -v '^-f' + create_compose_conf_list # this sets COMPOSE_CONF_LIST + echo "COMPOSE_CONF_LIST=" + echo ${COMPOSE_CONF_LIST} | tr ' ' '\n' | grep -v '^-f' + + cp "${COMPOSE_DIR}/docker-compose.yml" "${COMPOSE_FILE}" + + # the PROXY_SECURE_PORT is a little trick to make the compose file invalid without the usage of this wrapper script + PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} config > "${COMPOSE_FILE}.final" + + mv "${COMPOSE_FILE}.final" "${COMPOSE_FILE}" +fi -# the PROXY_SECURE_PORT is a little trick to make the compose file invalid without the usage of this wrapper script -PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} $* +docker-compose -f "${COMPOSE_FILE}" "$@" ERR=$? # execute post-compose function if exists and no error occurred @@ -125,11 +154,11 @@ while [ $# -gt 0 ] do if [ x"$1" = x"up" ]; then # we restart the proxy after an up to make sure nginx continue to work if any container IP address changes - PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} restart proxy + docker-compose -f "${COMPOSE_FILE}" restart proxy # run postgres post-startup setup script # Note: this must run before the post-docker-compose-up scripts since some may expect postgres databases to exist - postgres_id=$(PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} ps -q postgres) + postgres_id=$(docker-compose -f "${COMPOSE_FILE}" ps -q postgres) if [ ! -z "$postgres_id" ]; then docker exec ${postgres_id} /postgres-setup.sh fi diff --git a/birdhouse/read-configs.include.sh b/birdhouse/read-configs.include.sh index 85f4950dc..89ebe443a 100644 --- a/birdhouse/read-configs.include.sh +++ b/birdhouse/read-configs.include.sh @@ -209,15 +209,18 @@ create_compose_conf_list() { cd "$COMPOSE_DIR" || return fi - COMPOSE_CONF_LIST="-f docker-compose.yml" + [ -z "$BUILD_DIR" ] && return + + COMPOSE_CONF_LIST="-f ${BUILD_DIR}/docker-compose.yml" COMPONENT_OVERRIDES='' LOADED_COMPONENTS='' for adir in $ALL_CONF_DIRS; do service_name=$(basename "$adir") + build_dir_loc="${BUILD_DIR}/${service_name}" LOADED_COMPONENTS="${LOADED_COMPONENTS}\n${service_name}" if [ -f "$adir/docker-compose-extra.yml" ]; then - COMPOSE_CONF_LIST="${COMPOSE_CONF_LIST} -f $adir/docker-compose-extra.yml" + COMPOSE_CONF_LIST="${COMPOSE_CONF_LIST} -f ${build_dir_loc}/docker-compose-extra.yml" fi # If previously loaded components specified overrides for the component that was just loaded, load those overrides now @@ -229,10 +232,11 @@ create_compose_conf_list() { override_service_name=$(basename "$conf_dir") extra_compose="$conf_dir/docker-compose-extra.yml" if [ -f "$extra_compose" ]; then + build_extra_compose="${build_dir_loc}/config/${override_service_name}/docker-compose-extra.yml" if printf '%b' "${LOADED_COMPONENTS}" | grep -q "^$override_service_name$"; then - COMPOSE_CONF_LIST="${COMPOSE_CONF_LIST} -f $extra_compose" + COMPOSE_CONF_LIST="${COMPOSE_CONF_LIST} -f ${build_extra_compose}" else - COMPONENT_OVERRIDES="${COMPONENT_OVERRIDES}\n${override_service_name} -f ${extra_compose}" + COMPONENT_OVERRIDES="${COMPONENT_OVERRIDES}\n${override_service_name} -f ${build_extra_compose}" fi fi done diff --git a/birdhouse/scripts/get-services-json.include.sh b/birdhouse/scripts/get-services-json.include.sh index fd5a9d257..b7a239ded 100755 --- a/birdhouse/scripts/get-services-json.include.sh +++ b/birdhouse/scripts/get-services-json.include.sh @@ -3,8 +3,9 @@ # default value in case of error or missing definitions for adir in ${ALL_CONF_DIRS}; do - [ -f "${adir}/service-config.json" ] || continue - SERVICES="${SERVICES}$([ -n "${SERVICES}" ] && echo ',') $(cat "${adir}/service-config.json")" + service_config="${BUILD_DIR}/$(basename "$adir")/service-config.json" + [ -f "${service_config}" ] || continue + SERVICES="${SERVICES}$([ -n "${SERVICES}" ] && echo ',') $(cat "${service_config}")" done if [ -z "${SERVICES}" ]; then diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py index 2943561e4..3c9d1c663 100644 --- a/tests/test_read_configs_include.py +++ b/tests/test_read_configs_include.py @@ -28,6 +28,12 @@ def read_config_include_file(root_dir) -> str: return os.path.join(root_dir, "birdhouse", "read-configs.include.sh") +@pytest.fixture +def tmp_build_dir(): + with tempfile.TemporaryDirectory() as build_dir: + yield build_dir + + def set_local_env(env_file: io.FileIO, content: str | dict) -> None: env_file.truncate() if isinstance(content, dict): @@ -169,48 +175,50 @@ def test_delayed_eval_custom_value(self, read_config_include_file) -> None: class TestCreateComposeConfList: - default_conf_list_order: list[str] = [ - "docker-compose.yml", - "./config/proxy/docker-compose-extra.yml", - "./config/canarie-api/config/proxy/docker-compose-extra.yml", - "./config/geoserver/docker-compose-extra.yml", - "./config/geoserver/config/canarie-api/docker-compose-extra.yml", - "./config/geoserver/config/proxy/docker-compose-extra.yml", - "./config/wps_outputs-volume/docker-compose-extra.yml", - "./config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml", - "./config/wps_outputs-volume/config/proxy/docker-compose-extra.yml", - "./config/postgres/docker-compose-extra.yml", - "./config/finch/docker-compose-extra.yml", - "./config/finch/config/canarie-api/docker-compose-extra.yml", - "./config/finch/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/raven/docker-compose-extra.yml", - "./config/raven/config/canarie-api/docker-compose-extra.yml", - "./config/raven/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/data-volume/docker-compose-extra.yml", - "./config/hummingbird/docker-compose-extra.yml", - "./config/hummingbird/config/canarie-api/docker-compose-extra.yml", - "./config/hummingbird/config/data-volume/docker-compose-extra.yml", - "./config/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml", - "./config/thredds/docker-compose-extra.yml", - "./config/thredds/config/canarie-api/docker-compose-extra.yml", - "./config/thredds/config/proxy/docker-compose-extra.yml", - "./config/portainer/docker-compose-extra.yml", - "./config/portainer/config/proxy/docker-compose-extra.yml", - "./config/magpie/docker-compose-extra.yml", - "./config/geoserver/config/magpie/docker-compose-extra.yml", - "./config/finch/config/magpie/docker-compose-extra.yml", - "./config/raven/config/magpie/docker-compose-extra.yml", - "./config/hummingbird/config/magpie/docker-compose-extra.yml", - "./config/thredds/config/magpie/docker-compose-extra.yml", - "./config/magpie/config/canarie-api/docker-compose-extra.yml", - "./config/magpie/config/proxy/docker-compose-extra.yml", - "./config/twitcher/docker-compose-extra.yml", - "./config/twitcher/config/canarie-api/docker-compose-extra.yml", - "./config/twitcher/config/proxy/docker-compose-extra.yml", - "./config/jupyterhub/docker-compose-extra.yml", - "./config/jupyterhub/config/canarie-api/docker-compose-extra.yml", - "./config/jupyterhub/config/proxy/docker-compose-extra.yml", - ] + @staticmethod + def default_conf_list_order(tmp_build_dir) -> list[str]: + return [ + f"{tmp_build_dir}/docker-compose.yml", + f"{tmp_build_dir}/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/canarie-api/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/geoserver/docker-compose-extra.yml", + f"{tmp_build_dir}/geoserver/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/geoserver/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/wps_outputs-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/wps_outputs-volume/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/postgres/docker-compose-extra.yml", + f"{tmp_build_dir}/finch/docker-compose-extra.yml", + f"{tmp_build_dir}/finch/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/finch/config/wps_outputs-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/raven/docker-compose-extra.yml", + f"{tmp_build_dir}/raven/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/raven/config/wps_outputs-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/data-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/hummingbird/docker-compose-extra.yml", + f"{tmp_build_dir}/hummingbird/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/hummingbird/config/data-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/hummingbird/config/wps_outputs-volume/docker-compose-extra.yml", + f"{tmp_build_dir}/thredds/docker-compose-extra.yml", + f"{tmp_build_dir}/thredds/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/thredds/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/portainer/docker-compose-extra.yml", + f"{tmp_build_dir}/portainer/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/geoserver/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/finch/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/raven/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/hummingbird/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/thredds/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/magpie/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/magpie/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/twitcher/docker-compose-extra.yml", + f"{tmp_build_dir}/twitcher/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/twitcher/config/proxy/docker-compose-extra.yml", + f"{tmp_build_dir}/jupyterhub/docker-compose-extra.yml", + f"{tmp_build_dir}/jupyterhub/config/canarie-api/docker-compose-extra.yml", + f"{tmp_build_dir}/jupyterhub/config/proxy/docker-compose-extra.yml", + ] def run_func(self, include_file: str, local_env: dict, command_suffix: str = "") -> subprocess.CompletedProcess: if command_suffix: @@ -231,22 +239,24 @@ def run_func(self, include_file: str, local_env: dict, command_suffix: str = "") ) return proc - def test_all_conf_dirs_empty(self, read_config_include_file): + def test_all_conf_dirs_empty(self, read_config_include_file, tmp_build_dir): """Test that only the base compose file is used when ALL_CONF_DIRS is empty""" - proc = self.run_func(read_config_include_file, {}, 'echo "$COMPOSE_CONF_LIST"') - assert split_and_strip(get_command_stdout(proc)) == ["-f docker-compose.yml"] + proc = self.run_func(read_config_include_file, {"BUILD_DIR": tmp_build_dir}, 'echo "$COMPOSE_CONF_LIST"') + assert split_and_strip(get_command_stdout(proc)) == [f"-f {tmp_build_dir}/docker-compose.yml"] @pytest.mark.usefixtures("run_in_compose_dir") - def test_compose_no_overrides(self, read_config_include_file): + def test_compose_no_overrides(self, read_config_include_file, tmp_build_dir): """Test that COMPOSE_CONF_LIST is set correctly when there are no overrides""" proc = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/finch ./config/raven"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, + {"ALL_CONF_DIRS": "./config/finch ./config/raven", "BUILD_DIR": tmp_build_dir}, + 'echo "$COMPOSE_CONF_LIST"' ) print(proc.stdout) # useful for debugging when assert fail assert split_and_strip(get_command_stdout(proc), split_on="-f") == [ - "docker-compose.yml", - "./config/finch/docker-compose-extra.yml", - "./config/raven/docker-compose-extra.yml", + f"{tmp_build_dir}/docker-compose.yml", + f"{tmp_build_dir}/finch/docker-compose-extra.yml", + f"{tmp_build_dir}/raven/docker-compose-extra.yml", ] def test_compose_in_order(self, read_config_include_file): @@ -262,25 +272,27 @@ def test_compose_in_order(self, read_config_include_file): assert out1 == out2[:1] + out2[:0:-1] @pytest.mark.usefixtures("run_in_compose_dir") - def test_compose_overrides(self, read_config_include_file): + def test_compose_overrides(self, read_config_include_file, tmp_build_dir): """Test that COMPOSE_CONF_LIST is set correctly when there are overrides""" proc = self.run_func( - read_config_include_file, {"ALL_CONF_DIRS": "./config/finch ./config/magpie"}, 'echo "$COMPOSE_CONF_LIST"' + read_config_include_file, + {"ALL_CONF_DIRS": "./config/finch ./config/magpie", "BUILD_DIR": tmp_build_dir}, + 'echo "$COMPOSE_CONF_LIST"' ) print(proc.stdout) # useful for debugging when assert fail assert split_and_strip(get_command_stdout(proc), split_on="-f") == [ - "docker-compose.yml", - "./config/finch/docker-compose-extra.yml", - "./config/magpie/docker-compose-extra.yml", - "./config/finch/config/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/docker-compose.yml", + f"{tmp_build_dir}/finch/docker-compose-extra.yml", + f"{tmp_build_dir}/magpie/docker-compose-extra.yml", + f"{tmp_build_dir}/finch/config/magpie/docker-compose-extra.yml", ] @pytest.mark.usefixtures("run_in_compose_dir") - def test_default_all_conf_dirs(self, read_config_include_file): + def test_default_all_conf_dirs(self, read_config_include_file, tmp_build_dir): proc = self.run_func( read_config_include_file, - {"ALL_CONF_DIRS": " ".join(TestReadConfigs.default_all_conf_order)}, + {"ALL_CONF_DIRS": " ".join(TestReadConfigs.default_all_conf_order), "BUILD_DIR": tmp_build_dir}, 'echo "$COMPOSE_CONF_LIST"', ) print(proc.stdout) # useful for debugging when assert fail - assert split_and_strip(get_command_stdout(proc), split_on="-f") == self.default_conf_list_order + assert split_and_strip(get_command_stdout(proc), split_on="-f") == self.default_conf_list_order(tmp_build_dir)