Commit Graph
105 Commits
Author SHA1 Message Date
bruhn_b c5862a784d Merge pull request 'bump scicat-rocrate-qa' (#31) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#31
2026-08-17 14:46:00 +02:00
fpotier 479ef33cd0 bump scicat-rocrate-qa 2026-08-17 14:44:41 +02:00
bruhn_b c8c2dfc116 Merge pull request 'deploy omny to DMZ' (#30) from omny into main
Reviewed-on: linux/WebHosting_DMZ#30
2026-08-17 12:42:38 +02:00
bruhn_b 6dbfd920d3 deploy omny to DMZ
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-17 12:41:49 +02:00
bruhn_b 4e31395218 Merge pull request 'move pct from docker to docker-dmz' (#29) from pct into main
Reviewed-on: linux/WebHosting_DMZ#29
2026-08-13 10:53:45 +02:00
bruhn_b f8a67be32e move pct from docker to docker-dmz
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-13 10:51:40 +02:00
bruhn_b 6e160f8329 Merge pull request 'scicat-rocrate-qa: config' (#28) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#28
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2026-08-11 14:20:59 +02:00
fpotier 7b49e635a7 update hostname 2026-08-11 14:19:10 +02:00
bruhn_b 1121d4b654 Merge pull request 'MCDA SRF update' (#27) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#27
2026-08-10 13:32:38 +02:00
River ecc77916ba Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ 2026-08-10 12:03:54 +02:00
River ff7a5d3153 MCDA SRF update 2026-08-10 12:03:53 +02:00
bruhn_b 72ddfbdca5 Merge pull request 'bump scicat-rocrate-qa' (#26) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#26
2026-08-06 15:18:35 +02:00
fpotier b7c04ac7cf bump scicat-rocrate-qa 2026-08-06 14:08:49 +02:00
bruhn_b 803ddcfcf5 Merge pull request 'bump scicat-rocrate-qa' (#25) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#25
2026-08-06 11:40:59 +02:00
fpotier 52fff61a22 bump scicat-rocrate-qa 2026-08-06 11:35:43 +02:00
bruhn_b 04bd1da6e8 Merge pull request 'scicat-rocrate: enable logging on the NFS share' (#24) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main
Reviewed-on: linux/WebHosting_DMZ#24
2026-08-05 11:16:21 +02:00
fpotier 29f0167e0d bump version 2026-08-05 11:12:54 +02:00
fpotier aeeaeac185 log on NFS share 2026-08-05 09:57:29 +02:00
bruhn_b e7a90c5644 Merge pull request 'UP-MAVT update' (#22) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#22
2026-08-04 08:15:22 +02:00
River 576450eb14 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ 2026-08-03 16:49:12 +02:00
River 0ebd01f504 UP-MAVT update 2026-08-03 16:49:11 +02:00
bruhn_b 484ee182af Merge pull request 'Update scicat-rocrate deployment' (#21) from data-catalog-services/WebHosting_DMZ:update-scicat-rocrate into main
Reviewed-on: linux/WebHosting_DMZ#21
2026-07-30 13:02:36 +02:00
fpotier d0f591469e update scicat-rocrate 2026-07-29 16:03:47 +02:00
bruhn_b 9f6174cab5 Merge pull request 'Deploy Rhodo 1.2.0 images' (#20) from hidber_f/WebHosting_DMZ:rhodo-1.2.0 into main
Reviewed-on: linux/WebHosting_DMZ#20
2026-07-23 11:29:48 +02:00
flurinh fd1f3f7583 Deploy Rhodo 1.2.0 images 2026-07-23 10:15:01 +02:00
ebner 9282a905ff Merge pull request 'fix felira' (#19) from ebner-patch-2 into main
Reviewed-on: linux/WebHosting_DMZ#19
2026-07-20 09:02:17 +02:00
ebner c8295d6ab0 fix felira 2026-07-20 09:01:42 +02:00
bruhn_b b145fd7b7e Update docker-compose.yaml 2026-07-17 12:01:34 +02:00
bruhn_b c2e0ccd183 Update docker-compose.yaml 2026-07-17 10:07:16 +02:00
bruhn_b 864f810113 change mount points for rocrate qa
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-16 14:53:19 +02:00
ebner f5c726326a Merge pull request 'Update docker-compose.yaml' (#18) from ebner-patch-1 into main
Reviewed-on: linux/WebHosting_DMZ#18
2026-07-14 11:14:24 +02:00
ebner 09495fa0db Update docker-compose.yaml 2026-07-14 11:13:16 +02:00
bruhn_b 021c5ec54a Merge pull request 'Update MCDA-SRF' (#17) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#17
2026-07-13 15:32:59 +02:00
River 826ac1ed47 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ 2026-07-13 15:29:44 +02:00
River eadf3b6da5 Update MCDA-SRF 2026-07-13 15:29:43 +02:00
bruhn_b 1ae1cae663 upload limit for felira-web
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-13 13:39:18 +02:00
bruhn_b 4a3d6c4a9e add data dir for leaps
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-08 10:38:10 +02:00
bruhn_b 0caec46eb8 felira container name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-07 12:14:13 +02:00
bruhn_b d62d5234e0 all names
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-02 16:16:54 +02:00
bruhn_b 63a48a50a0 the webserver is using some hardcoded values
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-02 16:16:01 +02:00
bruhn_b 71bb3fa482 Merge pull request 'MCDA-UP enhance debug log update' (#16) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#16
2026-07-01 18:58:30 +02:00
River 969ecdcb8c MCDA-UP enhance debug log update 1 2026-07-01 17:17:50 +02:00
River edf50f947c MCDA-UP enhance debug log update 2026-07-01 16:47:47 +02:00
bruhn_b 0b5b1e2ec0 Merge pull request 'deploy leaps app for fritjof' (#14) from leaps_felira into main
Reviewed-on: linux/WebHosting_DMZ#14
2026-07-01 16:24:05 +02:00
bruhn_b 78ea71cf41 deploy leaps app for fritjof
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-01 16:22:44 +02:00
bruhn_b 0273021cf3 typo
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-01 12:22:59 +02:00
bruhn_b 6f024ad9a7 Merge pull request 'add scicat-rocrate QA' (#13) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main
Reviewed-on: linux/WebHosting_DMZ#13
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2026-07-01 12:20:47 +02:00
fpotier ac6622d500 update certificate name 2026-07-01 11:51:19 +02:00
fpotier 24cb61de69 fix service name 2026-07-01 11:43:40 +02:00
fpotier c888f5fa86 mount nfs share 2026-07-01 11:42:11 +02:00