Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CanDIG/htsget_app merging: DIG-1585: if results < AGGREGATE_COUNT_THRESHOLD, censor it #578

Merged
merged 5 commits into from
May 9, 2024
Merged

CanDIG/htsget_app merging: DIG-1585: if results < AGGREGATE_COUNT_THRESHOLD, censor it #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c0500a
Update docker-compose.yml
daisieh May 3, 2024
ab65431
updating submodules (#575)
candigbot May 4, 2024
9a2e5ce
Add other default users to Slack during nightly build (#568)
mshadbolt May 6, 2024
c516c16
updating submodules (#576)
candigbot May 7, 2024
10aad88
updating submodules
invalid-email-address May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/candig-data-portal/candig-data-portal
Open in desktop
Submodule candig-data-portal updated 1 files
+1 −1 src/store/constant.js
1 change: 1 addition & 0 deletions lib/htsget/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/htsget/htsget_app
Open in desktop
Submodule htsget_app updated 6 files
+2 −1 .travis.yml
+1 −0 config.ini
+2 −0 entrypoint.sh
+1 −2 htsget_server/beacon_openapi.yaml
+8 −1 htsget_server/beacon_operations.py
+2 −0 htsget_server/config.py
2 changes: 1 addition & 1 deletion lib/query/query
Open in desktop
Submodule query updated 1 files
+1 −1 query_server/query_operations.py
2 changes: 1 addition & 1 deletion nightly_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)\`\`\`"

Loading