Keep develop in sync with main #221

lablans · 2024-08-30T10:34:54Z

No description provided.

Requested by Zdenka

In ENVIRONMENT=production, use main tag for Samply.Beam.

Recommendation for standalone Bridgehead

Configure beam-connect to trust ds-orchestrator beam proxy

Update Develop from Main

Added DHKI project

add pilot projects

Deactivate traefik dashboard by default. Add trailing slash to PathPrefix to clarify the URL the dashboard is available at.

Before this change CentraXX was redirected to the central login servers then interacting with the id-management

feature: log git branches to healthchecks and code refactoring

Allow Usage of Centraxx Interface without login

fix: deactivate landingpage for KR project

PierreDelpy

Features like Search, Export, QB and routine operation have been tested without any abnormalities

Threated · 2024-10-15T07:20:07Z

This will downgrade beam to main but there were no breaking changes introduced and no major bug fixes so it should be fine. Will make a new beam release soon™ anyway.

lablans · 2024-10-15T07:28:53Z

cce/docker-compose.yml

+
+services:
+  blaze:
+    image: docker.verbis.dkfz.de/cache/samply/blaze:0.28


Move version number into variable

lablans · 2024-10-15T07:29:44Z

ccp/modules/id-management-compose.yml

@@ -57,7 +65,7 @@ services:
      - "/tmp/bridgehead/patientlist/:/docker-entrypoint-initdb.d/"

  traefik-forward-auth:
-    image: docker.verbis.dkfz.de/cache/oauth2-proxy/oauth2-proxy:v7.6.0
+    image: docker.verbis.dkfz.de/cache/oauth2-proxy/oauth2-proxy:latest


Move version number into variable

lablans · 2024-10-15T07:30:42Z

dhki/docker-compose.yml

+      - "blaze"
+
+  beam-proxy:
+    image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop


Is tag develop intended? Can the tag be externalized into a variable?

lablans · 2024-10-15T07:31:04Z

dhki/vars

+
+BROKER_URL_FOR_PREREQ=$BROKER_URL
+
+POSTGRES_TAG=15.6-alpine


This is a standard version -- can it go into a shared config?

lablans · 2024-10-15T07:31:40Z

kr/modules/exporter-compose.yml

+
+services:
+  exporter:
+    image: docker.verbis.dkfz.de/ccp/dktk-exporter:latest


Move version number into variable

lablans · 2024-10-15T07:34:33Z

kr/modules/teiler-compose.yml

+
+
+  teiler-backend:
+    image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:latest


Move version number into variable

lablans · 2024-10-15T07:35:04Z

kr/modules/teiler.md

Can we have duplicate files like this a some kind of "git symlink"?

lablans · 2024-10-15T07:35:25Z

lib/functions.sh

 			export BLAZE_RESOURCE_CACHE_CAP=128000;
+			export BLAZE_CQL_CACHE_CAP=32;


Suggested change

export BLAZE_RESOURCE_CACHE_CAP=128000;

export BLAZE_CQL_CACHE_CAP=32;

export BLAZE_RESOURCE_CACHE_CAP=128000

export BLAZE_CQL_CACHE_CAP=32

lablans · 2024-10-15T07:35:31Z

lib/functions.sh

 		else
 			export BLAZE_RESOURCE_CACHE_CAP=$((available_system_memory_chunks * 312500))
+			export BLAZE_CQL_CACHE_CAP=$((($system_memory_in_mb/4)/16));


Suggested change

export BLAZE_CQL_CACHE_CAP=$((($system_memory_in_mb/4)/16));

export BLAZE_CQL_CACHE_CAP=$((($system_memory_in_mb/4)/16))

lablans · 2024-10-15T07:36:24Z

lib/prepare-system.sh

+	itcc)
+		site_configuration_repository_middle="git.verbis.dkfz.de/itcc-sites/"
+        ;;
+    dhki)
+        site_configuration_repository_middle="git.verbis.dkfz.de/dhki/"
+		;;
+	kr)


Suggested change

itcc)

site_configuration_repository_middle="git.verbis.dkfz.de/itcc-sites/"

;;

dhki)

site_configuration_repository_middle="git.verbis.dkfz.de/dhki/"

;;

kr)

itcc)

site_configuration_repository_middle="git.verbis.dkfz.de/itcc-sites/"

;;

dhki)

site_configuration_repository_middle="git.verbis.dkfz.de/dhki/"

;;

kr)

* feat: add auto archiving action --------- Co-authored-by: [email protected] <[email protected]> Co-authored-by: Martin Lablans <[email protected]>

Croft and others added 23 commits January 25, 2024 13:49

Recommendation for standalone Bridgehead

8fddb80

Requested by Zdenka

Amended following Tobias' comments

e4bc34c

initialize develop; add itcc and cce

cfa8506

In ENVIRONMENT=production, use main tag for Samply.Beam.

4ab10ff

Merge pull request #197 from samply/beam-tag

bc0f46e

In ENVIRONMENT=production, use main tag for Samply.Beam.

feat: Configure beam-connect to trust ds-orchestrator beam proxy

83b653e

Move down, rephrase

33a2505

Merge pull request #144 from samply/documentation/sharing_vm

aca22fb

Recommendation for standalone Bridgehead

Merge pull request #199 from samply/feat/ds-orchestrator

775cef5

Configure beam-connect to trust ds-orchestrator beam proxy

readme: Data protection group --> officer

4568e32

Merge pull request #226 from samply/main

c585322

Update Develop from Main

feat: added dhki project

6465dcb

Update queries_to_cache.conf

735e064

fix: re-add modules

f0bdb5c

fix: fix bash path

77c870a

fix: remove accidental commit

969f1e7

Merge pull request #223 from samply/feat/add-dkfz-hector-ki-project

b1de626

Added DHKI project

Feature/pilot projects backup (#227)

65359c2

add pilot projects

Traefik dashboard

24da24d

Deactivate traefik dashboard by default. Add trailing slash to PathPrefix to clarify the URL the dashboard is available at.

fix: allow usage of centraxx interface without login

eb29558

Before this change CentraXX was redirected to the central login servers then interacting with the id-management

Feature/send branch to healthchecks (#232)

599bcfc

feature: log git branches to healthchecks and code refactoring

Merge pull request #233 from samply/fix/id-management-redirection

f328e40

Allow Usage of Centraxx Interface without login

fix: deactivate landingpage for KR project (#234)

072ee34

fix: deactivate landingpage for KR project

torbrenner marked this pull request as ready for review October 10, 2024 09:20

torbrenner requested review from PierreDelpy and Threated October 10, 2024 09:20

PierreDelpy mentioned this pull request Oct 10, 2024

feat: added blaze cql cache #236

Merged

feat: added blaze cql cache (#236)

3312ca8

PierreDelpy approved these changes Oct 15, 2024

View reviewed changes

Threated approved these changes Oct 15, 2024

View reviewed changes

lablans commented Oct 15, 2024

View reviewed changes

PierreDelpy mentioned this pull request Oct 15, 2024

feat: use project overarching vars #239

Open

feat: add auto archiving action (#238)

7aaee5e

* feat: add auto archiving action --------- Co-authored-by: [email protected] <[email protected]> Co-authored-by: Martin Lablans <[email protected]>

PierreDelpy merged commit 75089ab into main Oct 15, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Keep develop in sync with main #221

Keep develop in sync with main #221

lablans commented Aug 30, 2024

PierreDelpy left a comment

Threated commented Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024

lablans Oct 15, 2024



		teiler-backend:
		image: docker.verbis.dkfz.de/ccp/dktk-teiler-backend:latest

		export BLAZE_RESOURCE_CACHE_CAP=128000;
		export BLAZE_CQL_CACHE_CAP=32;

	export BLAZE_CQL_CACHE_CAP=$((($system_memory_in_mb/4)/16));
	export BLAZE_CQL_CACHE_CAP=$((($system_memory_in_mb/4)/16))


		BROKER_URL_FOR_PREREQ=$BROKER_URL

		POSTGRES_TAG=15.6-alpine

Keep develop in sync with main #221

Keep develop in sync with main #221

Conversation

lablans commented Aug 30, 2024

PierreDelpy left a comment

Choose a reason for hiding this comment

Threated commented Oct 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment