From 4c0500a035f39d7249461eb286b46db6b91a43fa Mon Sep 17 00:00:00 2001 From: Daisie Huang Date: Fri, 3 May 2024 11:34:43 -0700 Subject: [PATCH 1/5] Update docker-compose.yml --- lib/htsget/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/htsget/docker-compose.yml b/lib/htsget/docker-compose.yml index e0365c034..e20e50829 100644 --- a/lib/htsget/docker-compose.yml +++ b/lib/htsget/docker-compose.yml @@ -40,6 +40,7 @@ services: POSTGRES_POST: 5433 POSTGRES_USERNAME_FILE: "/run/secrets/metadata-db-user" POSTGRES_PASSWORD_FILE: "/run/secrets/metadata-db-secret" + AGGREGATE_COUNT_THRESHOLD: ${AGGREGATE_COUNT_THRESHOLD} extra_hosts: - "${CANDIG_DOMAIN}:${LOCAL_IP_ADDR}" healthcheck: From ab65431ecacca502ed4e5bf826c852480766b296 Mon Sep 17 00:00:00 2001 From: candigbot <87504143+candigbot@users.noreply.github.com> Date: Sat, 4 May 2024 00:27:38 -0400 Subject: [PATCH 2/5] updating submodules (#575) --- lib/candig-data-portal/candig-data-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/candig-data-portal/candig-data-portal b/lib/candig-data-portal/candig-data-portal index 2cf7391ed..a40477522 160000 --- a/lib/candig-data-portal/candig-data-portal +++ b/lib/candig-data-portal/candig-data-portal @@ -1 +1 @@ -Subproject commit 2cf7391ede650ee35688d68e3346daa228390099 +Subproject commit a40477522686803b3f3095ad5e1a678f701c2360 From 9a2e5ce3834858539bd7d558e7a77651c8b04c80 Mon Sep 17 00:00:00 2001 From: Marion Date: Mon, 6 May 2024 12:57:08 -0700 Subject: [PATCH 3/5] Add other default users to Slack during nightly build (#568) * add other users to slack * add spaces Co-authored-by: OrdiNeu --------- Co-authored-by: OrdiNeu --- nightly_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nightly_build.sh b/nightly_build.sh index e114b52c4..6a310c890 100755 --- a/nightly_build.sh +++ b/nightly_build.sh @@ -88,5 +88,5 @@ pip install -r requirements.txt python katsu_ingest.py cd $BUILD_PATH -PostToSlack "\`\`\`Build success:\nhttp://candig-dev.hpc4healthlocal:5080/\nusername: $(cat ./tmp/secrets/keycloak-test-site-admin)\npassword $(cat ./tmp/secrets/keycloak-test-site-admin-password)\`\`\`" +PostToSlack "\`\`\`Build success:\nhttp://candig-dev.hpc4healthlocal:5080/\nusername: $(cat ./tmp/secrets/keycloak-test-site-admin)\npassword $(cat ./tmp/secrets/keycloak-test-site-admin-password)\nusername: $(cat ./tmp/secrets/keycloak-test-user)\npassword $(cat ./tmp/secrets/keycloak-test-user-password)\nusername: $(cat ./tmp/secrets/keycloak-test-user2)\npassword $(cat ./tmp/secrets/keycloak-test-user2-password)\`\`\`" From c516c1613193ebd3e9bc3372eed39b5dad6341e5 Mon Sep 17 00:00:00 2001 From: candigbot <87504143+candigbot@users.noreply.github.com> Date: Mon, 6 May 2024 21:02:12 -0400 Subject: [PATCH 4/5] updating submodules (#576) Co-authored-by: github-actions --- lib/query/query | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/query/query b/lib/query/query index 5e58e285c..8e3aed316 160000 --- a/lib/query/query +++ b/lib/query/query @@ -1 +1 @@ -Subproject commit 5e58e285c384f189dc348c833ed24c425627273c +Subproject commit 8e3aed31685c76a79965fb8666aa278b4f592da4 From 10aad88e5e22a81e08418fb0f9b53acbdba0a3f2 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 7 May 2024 19:04:29 +0000 Subject: [PATCH 5/5] updating submodules --- lib/htsget/htsget_app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/htsget/htsget_app b/lib/htsget/htsget_app index 417180f08..99cbf539c 160000 --- a/lib/htsget/htsget_app +++ b/lib/htsget/htsget_app @@ -1 +1 @@ -Subproject commit 417180f08d2a83191cc5b6394ec8063d3afec3ae +Subproject commit 99cbf539c6c0b1687beccc089f854bd98ffead7a