From 3c5896aab977d1b9edd3dbb4d2d90ae44dcc7f69 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 12:18:14 -0400
Subject: [PATCH 01/13] bump canarie-api to version 1.0.0

---
 .../canarie-api.conf.template                 |  2 +-
 .../config/proxy/docker-compose-extra.yml     |  7 +--
 birdhouse/components/canarie-api/default.env  |  2 +-
 .../canarie-api/docker-compose-extra.yml      | 44 +++++++++++++++++++
 .../docker_configuration.py.template          |  5 +--
 birdhouse/components/proxy/default.env        |  7 +++
 .../components/proxy/nginx.conf.template      |  2 +-
 7 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 birdhouse/components/canarie-api/docker-compose-extra.yml

diff --git a/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template b/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
index e843f54f8..d471214d7 100644
--- a/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
+++ b/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
@@ -1,5 +1,5 @@
     location /canarie/ {
-        proxy_pass http://127.0.0.1:2000;
+        proxy_pass http://canarie-api:2000;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Proto $real_scheme;
         proxy_set_header X-Script-Name /canarie;
diff --git a/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml b/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml
index 40338709d..bf4f16a58 100644
--- a/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml
+++ b/birdhouse/components/canarie-api/config/proxy/docker-compose-extra.yml
@@ -3,9 +3,4 @@ services:
   proxy:
     volumes:
       - ./components/canarie-api/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/canarie-api:ro
-      - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py
-      - ./components/canarie-api/entrypoint:/entrypoint:ro
-    environment:
-      CANARIE_API_CONFIG_FN: /config/docker_configuration.py
-      CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR}
-    entrypoint: /entrypoint
+      - proxy-logs:${PROXY_LOG_DIR}
diff --git a/birdhouse/components/canarie-api/default.env b/birdhouse/components/canarie-api/default.env
index 6f40700cd..c85f050e6 100644
--- a/birdhouse/components/canarie-api/default.env
+++ b/birdhouse/components/canarie-api/default.env
@@ -1,7 +1,7 @@
 # Folder inside "proxy" container to drop extra monitoring config
 export CANARIE_MONITORING_EXTRA_CONF_DIR="/conf.d"
 
-export PROXY_IMAGE="pavics/canarieapi:0.7.1"
+export CANARIE_IMAGE="pavics/canarieapi:1.0.0"
 
 # add any component that this component requires to run
 COMPONENT_DEPENDENCIES="
diff --git a/birdhouse/components/canarie-api/docker-compose-extra.yml b/birdhouse/components/canarie-api/docker-compose-extra.yml
new file mode 100644
index 000000000..c575b1558
--- /dev/null
+++ b/birdhouse/components/canarie-api/docker-compose-extra.yml
@@ -0,0 +1,44 @@
+version: "3.4"
+
+x-logging:
+  &default-logging
+  driver: "json-file"
+  options:
+    max-size: "50m"
+    max-file: "10"
+
+services:
+  canarie-api:
+    image: ${CANARIE_IMAGE}
+    container_name: canarie-api
+    volumes:
+      - canarie-data:/data/
+      - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py:ro
+      - ./components/canarie-api/entrypoint:/entrypoint:ro
+    environment:
+      CANARIE_API_CONFIG_FN: /config/docker_configuration.py
+      CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR}
+    restart: always
+    entrypoint: /entrypoint
+    logging: *default-logging
+
+  canarie-api-cron:
+    image: ${CANARIE_IMAGE}
+    container_name: canarie-api-cron
+    command: cron -f
+    depends_on:
+      - canarie-api
+    # The volumes and environment should be the same as the canarie-api container except for the proxy-logs volume
+    volumes:
+      - canarie-data:/data/:ro
+      - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py:ro
+      - ./components/canarie-api/entrypoint:/entrypoint:ro
+      - proxy-logs:/logs/:ro
+    environment:
+      CANARIE_API_CONFIG_FN: /config/docker_configuration.py
+      CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR}
+    logging: *default-logging
+
+volumes:
+  canarie-data:
+  proxy-logs:
diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template
index e92672dba..41f4d2596 100644
--- a/birdhouse/components/canarie-api/docker_configuration.py.template
+++ b/birdhouse/components/canarie-api/docker_configuration.py.template
@@ -13,9 +13,8 @@ logger = logging.getLogger("canarie-api-config")
 MY_SERVER_NAME = 'https://${PAVICS_FQDN_PUBLIC}/canarie'
 
 DATABASE = {
-    'filename': '/opt/local/src/CanarieAPI/stats.db',
-    'access_log': '/var/log/nginx/access_file.log',
-    'log_pid': '/var/run/nginx.pid'
+    'filename': '/data/stats.db',
+    'access_log': '/logs/${PROXY_LOG_FILE}'
 }
 
 
diff --git a/birdhouse/components/proxy/default.env b/birdhouse/components/proxy/default.env
index 5b67c210a..9d7ac7b4f 100644
--- a/birdhouse/components/proxy/default.env
+++ b/birdhouse/components/proxy/default.env
@@ -15,9 +15,14 @@ export PROXY_ROOT_LOCATION="return 302 https://\$host/jupyter/hub/login;"
 
 export INCLUDE_FOR_PORT_80='$([ x"$ALLOW_UNSECURE_HTTP" = x"True" ] && echo "include /etc/nginx/conf.d/all-services.include;" || echo "include /etc/nginx/conf.d/redirect-to-https.include;")'
 
+export PROXY_LOG_DIR="/var/log/nginx/"
+export PROXY_LOG_FILE="access_file.log"
+export PROXY_LOG_PATH='${PROXY_LOG_DIR}/${PROXY_LOG_FILE}'
+
 export DELAYED_EVAL="
   $DELAYED_EVAL
   INCLUDE_FOR_PORT_80
+  PROXY_LOG_PATH
 "
 
 # add any new variables not already in 'VARS' or 'OPTIONAL_VARS' that must be replaced in templates here
@@ -33,4 +38,6 @@ export OPTIONAL_VARS="
   \$INCLUDE_FOR_PORT_80
   \$PROXY_READ_TIMEOUT_VALUE
   \$PROXY_ROOT_LOCATION
+  \$PROXY_LOG_FILE
+  \$PROXY_LOG_PATH
 "
diff --git a/birdhouse/components/proxy/nginx.conf.template b/birdhouse/components/proxy/nginx.conf.template
index a8673a620..46479d035 100755
--- a/birdhouse/components/proxy/nginx.conf.template
+++ b/birdhouse/components/proxy/nginx.conf.template
@@ -19,7 +19,7 @@ http {
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  /var/log/nginx/access_file.log  main;
+    access_log  ${PROXY_LOG_PATH}  main;
 
     sendfile        on;
     #tcp_nopush     on;

From dc2dfd2e7fdec735c66afde50ed10dc5e07a51c1 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 14:21:33 -0400
Subject: [PATCH 02/13] update entrypoint

---
 birdhouse/components/canarie-api/entrypoint | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/birdhouse/components/canarie-api/entrypoint b/birdhouse/components/canarie-api/entrypoint
index 93155ab77..d6bc7208c 100755
--- a/birdhouse/components/canarie-api/entrypoint
+++ b/birdhouse/components/canarie-api/entrypoint
@@ -8,9 +8,4 @@ touch /etc/cron.d/canarieapi-cron
 pip install requests-cache
 
 # chain existing cmd
-exec /bin/sh -c "\
-  env >> /etc/environment && \
-  cron && \
-  nginx && \
-  gunicorn -b 0.0.0.0:2000 --workers 1 --log-level=DEBUG --timeout 30 -k gevent canarieapi.wsgi \
-"
+exec /bin/sh -c "gunicorn -b 0.0.0.0:2000 --workers 1 --log-level=DEBUG --timeout 30 -k gevent canarieapi.wsgi"

From 3bdb2e241e2d384e49e1df101a9ce1ef2e02e00a Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 14:32:30 -0400
Subject: [PATCH 03/13] move config files to the canarie-api container

---
 .../cowbird/config/canarie-api/docker-compose-extra.yml         | 2 +-
 .../finch/config/canarie-api/docker-compose-extra.yml           | 2 +-
 .../geoserver/config/canarie-api/docker-compose-extra.yml       | 2 +-
 .../hummingbird/config/canarie-api/docker-compose-extra.yml     | 2 +-
 .../jupyterhub/config/canarie-api/docker-compose-extra.yml      | 2 +-
 .../magpie/config/canarie-api/docker-compose-extra.yml          | 2 +-
 .../raven/config/canarie-api/docker-compose-extra.yml           | 2 +-
 .../components/stac/config/canarie-api/docker-compose-extra.yml | 2 +-
 .../thredds/config/canarie-api/docker-compose-extra.yml         | 2 +-
 .../twitcher/config/canarie-api/docker-compose-extra.yml        | 2 +-
 .../weaver/config/canarie-api/docker-compose-extra.yml          | 2 +-
 .../config/canarie-api/docker-compose-extra.yml                 | 2 +-
 .../catalog/config/canarie-api/docker-compose-extra.yml         | 2 +-
 .../flyingpigeon/config/canarie-api/docker-compose-extra.yml    | 2 +-
 .../frontend/config/canarie-api/docker-compose-extra.yml        | 2 +-
 .../malleefowl/config/canarie-api/docker-compose-extra.yml      | 2 +-
 .../phoenix/config/canarie-api/docker-compose-extra.yml         | 2 +-
 .../project-api/config/canarie-api/docker-compose-extra.yml     | 2 +-
 .../solr/config/canarie-api/docker-compose-extra.yml            | 2 +-
 .../config/canarie-api/docker-compose-extra.yml                 | 2 +-
 .../emu/config/canarie-api/docker-compose-extra.yml             | 2 +-
 .../generic_bird/config/canarie-api/docker-compose-extra.yml    | 2 +-
 .../testthredds/config/canarie-api/docker-compose-extra.yml     | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

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 9c3c178f5..55cfc0b5e 100644
--- a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 
 services:
-  proxy:
+  canarie-api:
     volumes:
       # NOTE:
       #   Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
diff --git a/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
index 0ecaeafb2..b93e24c1f 100644
--- a/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
index 773e461dc..7797f382b 100644
--- a/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
index 3a82361c2..858b37521 100644
--- a/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
index 074151fe9..538c11173 100644
--- a/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
index 3ea6c182b..be60622d7 100644
--- a/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
index e5b51c6f3..2a7976a75 100644
--- a/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro
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..56a46dc72 100644
--- a/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/stac/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/stac_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
index c02523e54..1c2ff10d4 100644
--- a/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro
diff --git a/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
index e23266c62..c34795da5 100644
--- a/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro
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 e55b15c77..5c68ea554 100644
--- a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml
@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
   # extend proxy configuration with weaver endpoints
-  proxy:
+  canarie-api:
     volumes:
       # NOTE:
       #   Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
diff --git a/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
index e2de96762..35193b2d2 100644
--- a/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./components/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/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/catalog/config/canarie-api/docker-compose-extra.yml
index fd67d5eaf..bf939f3a1 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/flyingpigeon/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml
index 89a66084f..bfa07c329 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/frontend/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/frontend/config/canarie-api/docker-compose-extra.yml
index d45650da1..863080668 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/malleefowl/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/malleefowl/config/canarie-api/docker-compose-extra.yml
index dfdbb10fe..8192185a5 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/phoenix/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/phoenix/config/canarie-api/docker-compose-extra.yml
index dd3413d37..090f69ff8 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/project-api/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/project-api/config/canarie-api/docker-compose-extra.yml
index 264d0b840..b204b8e7e 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/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/solr/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/solr/config/canarie-api/docker-compose-extra.yml
index 13d31a9b9..e22f5c2a4 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro
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..408022d12 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
@@ -1,6 +1,6 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     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
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..05f03e232 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./optional-components/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/generic_bird/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/generic_bird/config/canarie-api/docker-compose-extra.yml
index dadd099d3..e830025bc 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./optional-components/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/testthredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/optional-components/testthredds/config/canarie-api/docker-compose-extra.yml
index 585e26535..2aa9dd329 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
@@ -1,5 +1,5 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api:
     volumes:
     - ./optional-components/testthredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/testthredds_canarie_api_monitoring.py:ro

From be5150c362f187657ba599ab25c9f989fde6e644 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 15:39:40 -0400
Subject: [PATCH 04/13] fix canarie path

---
 .../config/proxy/conf.extra-service.d/canarie-api.conf.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template b/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
index d471214d7..6a322e8eb 100644
--- a/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
+++ b/birdhouse/components/canarie-api/config/proxy/conf.extra-service.d/canarie-api.conf.template
@@ -1,5 +1,5 @@
     location /canarie/ {
-        proxy_pass http://canarie-api:2000;
+        proxy_pass http://canarie-api:2000/;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Proto $real_scheme;
         proxy_set_header X-Script-Name /canarie;

From 4135b03c1e3e59b4a5733348c78b79f6e4b7b52a Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 15:46:38 -0400
Subject: [PATCH 05/13] cron container needs to write result to database

---
 birdhouse/components/canarie-api/docker-compose-extra.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/birdhouse/components/canarie-api/docker-compose-extra.yml b/birdhouse/components/canarie-api/docker-compose-extra.yml
index c575b1558..14b0f38b3 100644
--- a/birdhouse/components/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/canarie-api/docker-compose-extra.yml
@@ -30,7 +30,7 @@ services:
       - canarie-api
     # The volumes and environment should be the same as the canarie-api container except for the proxy-logs volume
     volumes:
-      - canarie-data:/data/:ro
+      - canarie-data:/data/
       - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py:ro
       - ./components/canarie-api/entrypoint:/entrypoint:ro
       - proxy-logs:/logs/:ro

From ebc9d431cd40c0ba23d68694b4e21022e6e52696 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 15:53:45 -0400
Subject: [PATCH 06/13] update CHANGES.md

---
 CHANGES.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8e5b99b09..b1a62fc05 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,13 @@
 [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
+
+- bump canarie-api version to 1.0.0
+
+  - This version of canarie-api permits running the proxy (nginx) container independently of the canarie-api
+    application. This makes it easier to monitor the logs of canarie-api and proxy containers simultaneously and
+    allows for the configuration files for canarie-api to be mapped to the canarie-api containers where appropriate.
 
 [2.2.1](https://github.com/bird-house/birdhouse-deploy/tree/2.2.1) (2024-05-01)
 ------------------------------------------------------------------------------------------------------------------

From e76fcd6ccbab83c8f25727e3dbc5ec8b7fb60bb9 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 16:00:59 -0400
Subject: [PATCH 07/13] handle cron entrypoint differently

---
 .../canarie-api/docker-compose-extra.yml           |  5 +++--
 birdhouse/components/canarie-api/entrypoint        |  6 ------
 birdhouse/components/canarie-api/entrypoint-cron   | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 birdhouse/components/canarie-api/entrypoint-cron

diff --git a/birdhouse/components/canarie-api/docker-compose-extra.yml b/birdhouse/components/canarie-api/docker-compose-extra.yml
index 14b0f38b3..2f9c3822c 100644
--- a/birdhouse/components/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/canarie-api/docker-compose-extra.yml
@@ -25,18 +25,19 @@ services:
   canarie-api-cron:
     image: ${CANARIE_IMAGE}
     container_name: canarie-api-cron
-    command: cron -f
     depends_on:
       - canarie-api
     # The volumes and environment should be the same as the canarie-api container except for the proxy-logs volume
     volumes:
       - canarie-data:/data/
       - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py:ro
-      - ./components/canarie-api/entrypoint:/entrypoint:ro
+      - ./components/canarie-api/entrypoint-cron:/entrypoint:ro
       - proxy-logs:/logs/:ro
     environment:
       CANARIE_API_CONFIG_FN: /config/docker_configuration.py
       CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR}
+    restart: always
+    entrypoint: /entrypoint
     logging: *default-logging
 
 volumes:
diff --git a/birdhouse/components/canarie-api/entrypoint b/birdhouse/components/canarie-api/entrypoint
index d6bc7208c..87e6cfb5f 100755
--- a/birdhouse/components/canarie-api/entrypoint
+++ b/birdhouse/components/canarie-api/entrypoint
@@ -1,11 +1,5 @@
 #!/bin/sh -x
 
-# hack needed for Boreas and Medus only else cronjob do not fire
-# this hack should still work for other deployments
-# remove if cause problem with newer version of canarieapi
-touch /etc/cron.d/canarieapi-cron
-
 pip install requests-cache
 
-# chain existing cmd
 exec /bin/sh -c "gunicorn -b 0.0.0.0:2000 --workers 1 --log-level=DEBUG --timeout 30 -k gevent canarieapi.wsgi"
diff --git a/birdhouse/components/canarie-api/entrypoint-cron b/birdhouse/components/canarie-api/entrypoint-cron
new file mode 100644
index 000000000..6fe04b0c9
--- /dev/null
+++ b/birdhouse/components/canarie-api/entrypoint-cron
@@ -0,0 +1,14 @@
+#!/bin/sh -x
+
+# hack needed for Boreas and Medus only else cronjob do not fire
+# this hack should still work for other deployments
+# remove if cause problem with newer version of canarieapi
+touch /etc/cron.d/canarieapi-cron
+
+pip install requests-cache
+
+# chain existing cmd
+exec /bin/sh -c "\
+  env >> /etc/environment && \
+  cron -f
+"
\ No newline at end of file

From 8002c5e0391798e70639a09070202e9d74a31aff Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 6 May 2024 16:03:47 -0400
Subject: [PATCH 08/13] fix entrypoint permissions

---
 birdhouse/components/canarie-api/entrypoint-cron | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 birdhouse/components/canarie-api/entrypoint-cron

diff --git a/birdhouse/components/canarie-api/entrypoint-cron b/birdhouse/components/canarie-api/entrypoint-cron
old mode 100644
new mode 100755

From 6c6f08c2ffee1458003b2c199a0021d2f5c2c3f7 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 7 May 2024 09:45:51 -0400
Subject: [PATCH 09/13] share configs between canarie containers

---
 birdhouse/components/canarie-api/entrypoint-cron             | 2 +-
 .../cowbird/config/canarie-api/docker-compose-extra.yml      | 5 +++--
 .../finch/config/canarie-api/docker-compose-extra.yml        | 3 ++-
 .../geoserver/config/canarie-api/docker-compose-extra.yml    | 3 ++-
 .../hummingbird/config/canarie-api/docker-compose-extra.yml  | 3 ++-
 .../jupyterhub/config/canarie-api/docker-compose-extra.yml   | 3 ++-
 .../magpie/config/canarie-api/docker-compose-extra.yml       | 3 ++-
 .../raven/config/canarie-api/docker-compose-extra.yml        | 3 ++-
 .../stac/config/canarie-api/docker-compose-extra.yml         | 3 ++-
 .../thredds/config/canarie-api/docker-compose-extra.yml      | 3 ++-
 .../twitcher/config/canarie-api/docker-compose-extra.yml     | 3 ++-
 .../weaver/config/canarie-api/docker-compose-extra.yml       | 3 ++-
 .../config/canarie-api/docker-compose-extra.yml              | 3 ++-
 .../catalog/config/canarie-api/docker-compose-extra.yml      | 3 ++-
 .../flyingpigeon/config/canarie-api/docker-compose-extra.yml | 3 ++-
 .../frontend/config/canarie-api/docker-compose-extra.yml     | 3 ++-
 .../malleefowl/config/canarie-api/docker-compose-extra.yml   | 3 ++-
 .../phoenix/config/canarie-api/docker-compose-extra.yml      | 3 ++-
 .../project-api/config/canarie-api/docker-compose-extra.yml  | 3 ++-
 .../solr/config/canarie-api/docker-compose-extra.yml         | 3 ++-
 .../config/canarie-api/docker-compose-extra.yml              | 3 ++-
 .../emu/config/canarie-api/docker-compose-extra.yml          | 3 ++-
 .../generic_bird/config/canarie-api/docker-compose-extra.yml | 3 ++-
 .../testthredds/config/canarie-api/docker-compose-extra.yml  | 3 ++-
 24 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/birdhouse/components/canarie-api/entrypoint-cron b/birdhouse/components/canarie-api/entrypoint-cron
index 6fe04b0c9..c6b8f8b8e 100755
--- a/birdhouse/components/canarie-api/entrypoint-cron
+++ b/birdhouse/components/canarie-api/entrypoint-cron
@@ -11,4 +11,4 @@ pip install requests-cache
 exec /bin/sh -c "\
   env >> /etc/environment && \
   cron -f
-"
\ No newline at end of file
+"
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 55cfc0b5e..b83fd637c 100644
--- a/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
       # NOTE:
       #   Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
@@ -9,4 +9,5 @@ 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
+      - ./components/cowbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_cowbird_config.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
index b93e24c1f..b78c6c7a7 100644
--- a/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/finch/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/finch/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/finch_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
index 7797f382b..73b91c2bc 100644
--- a/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/geoserver/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/geoserver/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/geoserver_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
index 858b37521..797289edb 100644
--- a/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/hummingbird/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/hummingbird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/hummingbird_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
index 538c11173..e750acc12 100644
--- a/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/jupyterhub/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/jupyterhub/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/jupyterhub_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
index be60622d7..f2cb34b6c 100644
--- a/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/magpie/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/magpie/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/magpie_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
index 2a7976a75..2caccb7a6 100644
--- a/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/raven/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/raven/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/raven_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 56a46dc72..bfdc5f679 100644
--- a/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/stac/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/stac/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/stac_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
index 1c2ff10d4..76c66b7d5 100644
--- a/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/thredds/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/thredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/thredds_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
index c34795da5..ac64915f4 100644
--- a/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/twitcher/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/twitcher/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/twitcher_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 5c68ea554..1a9ae8a78 100644
--- a/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/weaver/config/canarie-api/docker-compose-extra.yml
@@ -2,7 +2,7 @@ version: "3.4"
 
 services:
   # extend proxy configuration with weaver endpoints
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
       # NOTE:
       #   Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/components/canarie-api/docker_configuration.py'
@@ -12,3 +12,4 @@ services:
       #   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
+  canarie-api-cron: *canarie-volumes
diff --git a/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
index 35193b2d2..14ae3468b 100644
--- a/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./components/wps_outputs-volume/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/wps_outputs-volume_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 bf939f3a1..5c3699e17 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/catalog/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/catalog_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 bfa07c329..f1a85b416 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 863080668..8367b6728 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/frontend/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/frontend_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 8192185a5..2e5d9b4d4 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/malleefowl/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/malleefowl_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 090f69ff8..9f8463dd9 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/phoenix/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/phoenix_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 b204b8e7e..91406b639 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/project-api/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/project-api_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 e22f5c2a4..519f51f94 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./deprecated-components/solr/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/solr_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 408022d12..fd5f78f86 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
@@ -1,8 +1,9 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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 05f03e232..966eaac02 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./optional-components/emu/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/emu_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 e830025bc..d399de558 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./optional-components/generic_bird/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/generic_bird_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes
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 2aa9dd329..1f8713c61 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
@@ -1,5 +1,6 @@
 version: "3.4"
 services:
-  canarie-api:
+  canarie-api: &canarie-volumes
     volumes:
     - ./optional-components/testthredds/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/testthredds_canarie_api_monitoring.py:ro
+  canarie-api-cron: *canarie-volumes

From bd7e9b835aef0790da201dddccd581ecad430da6 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 7 May 2024 11:22:24 -0400
Subject: [PATCH 10/13] update tests

---
 tests/test_read_configs_include.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py
index 6de4ca49b..164b0032b 100644
--- a/tests/test_read_configs_include.py
+++ b/tests/test_read_configs_include.py
@@ -205,6 +205,7 @@ class TestCreateComposeConfList:
         "./components/stac/config/magpie/docker-compose-extra.yml",
         "./components/stac/config/proxy/docker-compose-extra.yml",
         "./components/stac/config/twitcher/docker-compose-extra.yml",
+        "./components/canarie-api/docker-compose-extra.yml",
         "./components/magpie/config/canarie-api/docker-compose-extra.yml",
         "./components/twitcher/config/canarie-api/docker-compose-extra.yml",
         "./components/cowbird/config/canarie-api/docker-compose-extra.yml",

From b2631b204b57f26c3842c92411f1b3c3627dd8ff Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 7 May 2024 16:11:54 -0400
Subject: [PATCH 11/13] fix volume mounts for optional component

---
 .../config/catalog/docker-compose-extra.yml                    | 3 ++-
 .../config/cowbird/docker-compose-extra.yml                    | 3 ++-
 .../config/finch/docker-compose-extra.yml                      | 3 ++-
 .../config/hummingbird/docker-compose-extra.yml                | 3 ++-
 .../config/malleefowl/docker-compose-extra.yml                 | 3 ++-
 .../config/ncwms2/docker-compose-extra.yml                     | 3 ++-
 .../config/raven/docker-compose-extra.yml                      | 3 ++-
 .../config/thredds/docker-compose-extra.yml                    | 3 ++-
 .../config/weaver/docker-compose-extra.yml                     | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

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..cb96e0300 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..6147f8051 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..659e6caa1 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..1849d84db 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..a1900cea3 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..fe3151b20 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..995f910cd 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..0e02bb9fa 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2
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..669ac807e 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
@@ -1,7 +1,8 @@
 version: "3.4"
 services:
-  proxy:
+  canarie-api: &canarie-volumes
     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-cron: *canarie-volumes
 
 # vi: tabstop=8 expandtab shiftwidth=2 softtabstop=2

From d478e95146418b9b2574bbdeb3edc526a37af3d7 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 7 May 2024 16:19:37 -0400
Subject: [PATCH 12/13] review updates

---
 CHANGES.md                                               | 2 +-
 birdhouse/components/canarie-api/default.env             | 9 ++++++++-
 .../components/canarie-api/docker-compose-extra.yml      | 2 +-
 birdhouse/components/canarie-api/entrypoint              | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b1a62fc05..276e827fc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@
 
 ## Changes
 
-- bump canarie-api version to 1.0.0
+- bump canarie-api version to [1.0.0](https://github.com/Ouranosinc/CanarieAPI/releases/tag/1.0.0)
 
   - This version of canarie-api permits running the proxy (nginx) container independently of the canarie-api
     application. This makes it easier to monitor the logs of canarie-api and proxy containers simultaneously and
diff --git a/birdhouse/components/canarie-api/default.env b/birdhouse/components/canarie-api/default.env
index c85f050e6..b1901b06f 100644
--- a/birdhouse/components/canarie-api/default.env
+++ b/birdhouse/components/canarie-api/default.env
@@ -1,7 +1,14 @@
 # Folder inside "proxy" container to drop extra monitoring config
 export CANARIE_MONITORING_EXTRA_CONF_DIR="/conf.d"
 
-export CANARIE_IMAGE="pavics/canarieapi:1.0.0"
+export CANARIE_DOCKER=pavics/canarieapi
+export CANARIE_VERSION=1.0.0
+export CANARIE_IMAGE='${CANARIE_DOCKER}:${CANARIE_VERSION}'
+
+export DELAYED_EVAL="
+  $DELAYED_EVAL
+  CANARIE_IMAGE
+"
 
 # add any component that this component requires to run
 COMPONENT_DEPENDENCIES="
diff --git a/birdhouse/components/canarie-api/docker-compose-extra.yml b/birdhouse/components/canarie-api/docker-compose-extra.yml
index 2f9c3822c..a2cd39cb7 100644
--- a/birdhouse/components/canarie-api/docker-compose-extra.yml
+++ b/birdhouse/components/canarie-api/docker-compose-extra.yml
@@ -32,7 +32,7 @@ services:
       - canarie-data:/data/
       - ./components/canarie-api/docker_configuration.py:/config/docker_configuration.py:ro
       - ./components/canarie-api/entrypoint-cron:/entrypoint:ro
-      - proxy-logs:/logs/:ro
+      - proxy-logs:/logs/:ro  # aligns with the DATABASE["access_log"] value in docker_configuration.py.template
     environment:
       CANARIE_API_CONFIG_FN: /config/docker_configuration.py
       CANARIE_MONITORING_EXTRA_CONF_DIR: ${CANARIE_MONITORING_EXTRA_CONF_DIR}
diff --git a/birdhouse/components/canarie-api/entrypoint b/birdhouse/components/canarie-api/entrypoint
index 87e6cfb5f..a2e22d2b1 100755
--- a/birdhouse/components/canarie-api/entrypoint
+++ b/birdhouse/components/canarie-api/entrypoint
@@ -2,4 +2,6 @@
 
 pip install requests-cache
 
-exec /bin/sh -c "gunicorn -b 0.0.0.0:2000 --workers 1 --log-level=DEBUG --timeout 30 -k gevent canarieapi.wsgi"
+exec /bin/sh -c "\
+  gunicorn -b 0.0.0.0:2000 --workers 1 --log-level=DEBUG --timeout 30 -k gevent canarieapi.wsgi \
+"

From 5a63d494db0e7b056f2b715e366b45fa9610b277 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 14 May 2024 09:43:50 -0400
Subject: [PATCH 13/13] =?UTF-8?q?Bump=20version:=202.2.2=20=E2=86=92=202.3?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg                                          | 6 +++---
 CHANGES.md                                                | 5 +++++
 Makefile                                                  | 2 +-
 README.rst                                                | 8 ++++----
 RELEASE.txt                                               | 2 +-
 .../canarie-api/docker_configuration.py.template          | 8 ++++----
 docs/source/conf.py                                       | 4 ++--
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e6b02d88c..3a42ebfc0 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.2
+current_version = 2.3.0
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2024-05-11T03:52:01Z
+search = {current_version} 2024-05-14T13:43:50Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2024-05-11T03:52:01Z
+values = 2024-05-14T13:43:50Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'
diff --git a/CHANGES.md b/CHANGES.md
index 28c95ba61..9129dbac8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,11 @@
 [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)
+
+[2.3.0](https://github.com/bird-house/birdhouse-deploy/tree/2.3.0) (2024-05-14)
+------------------------------------------------------------------------------------------------------------------
+
 ## Changes
 
 - bump canarie-api version to [1.0.0](https://github.com/Ouranosinc/CanarieAPI/releases/tag/1.0.0)
diff --git a/Makefile b/Makefile
index d61207407..80ec00070 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.2.2
+override APP_VERSION := 2.3.0
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
diff --git a/README.rst b/README.rst
index 265c931c7..f52799399 100644
--- a/README.rst
+++ b/README.rst
@@ -18,13 +18,13 @@ for a full-fledged production platform.
     * - citation
       - | |citation|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.2.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.3.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.2.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.3.0...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.2.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.3.0-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.2.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.3.0
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)
diff --git a/RELEASE.txt b/RELEASE.txt
index 6cdce2a63..df0b4c143 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1 +1 @@
-2.2.2 2024-05-11T03:52:01Z
+2.3.0 2024-05-14T13:43:50Z
diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template
index dc0c7d911..86e9d5b7d 100644
--- a/birdhouse/components/canarie-api/docker_configuration.py.template
+++ b/birdhouse/components/canarie-api/docker_configuration.py.template
@@ -108,8 +108,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.2.2',
-            'releaseTime': '2024-05-11T03:52:01Z',
+            'version': '2.3.0',
+            'releaseTime': '2024-05-14T13:43:50Z',
             'institution': '${SERVER_INSTITUTION}',
             'researchSubject': '${SERVER_SUBJECT}',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.2.2',
-            'releaseTime': '2024-05-11T03:52:01Z',
+            'version': '2.3.0',
+            'releaseTime': '2024-05-14T13:43:50Z',
             'institution': '${SERVER_INSTITUTION}',
             'researchSubject': '${SERVER_SUBJECT}',
             'supportEmail': '${SUPPORT_EMAIL}',
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6052b6c05..8ea32bc88 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.2'
+version = '2.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.2'
+release = '2.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.