From 47ffbf001bc6eaa263e462450582eb4ceec117be Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 27 Aug 2026 10:51:22 +0200 Subject: [PATCH 1/5] new image version 1.8 (#86) Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/86 Reviewed-by: buchel_k Co-authored-by: flechsig --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6b6a9ab..2343c1b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -181,7 +181,7 @@ services: # webcontent: # lx-fs-01.psi.ch:/lx_webhosting opticswiki: - image: gitea.psi.ch/images/opticswiki:1.7 + image: gitea.psi.ch/images/opticswiki:1.8 container_name: opticswiki restart: always volumes: From b9cc92d21018273a78936db41cc233710761e492 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Tue, 1 Sep 2026 08:43:03 +0200 Subject: [PATCH 2/5] access for lmx elog Signed-off-by: Basil Bruhn --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 2343c1b..c1e2cef 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -84,6 +84,7 @@ services: restart: always volumes: - /opt/logbooks/lmx:/usr/local/elog/logbooks + - /opt/webcontent/lmx/passwd.txt:/usr/local/elog/passwd.txt - /opt/webcontent/lmx/elog.cfg:/usr/local/elog/elogd.cfg networks: - backend From 6f7533a76b383c952ea22bb5f58ab9dfb3c10976 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 4 Sep 2026 09:49:03 +0200 Subject: [PATCH 3/5] edit classpath Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index c1e2cef..852e6f5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -424,6 +424,8 @@ services: # Authentifizierung für WebUI WEBAPP_SECURITY_AUTH_BASIC_USERNAME: psiadmin WEBAPP_SECURITY_AUTH_BASIC_PASSWORD: "$$2y$$10$$LA.TjBKRIDM/c6AJ86BZ/elpa9InzVbzqzLsyfc1Wt7h3S3N8MUPm" + CLASSPATH: "/application/lib/sapjco3.jar" + networks: - backend banf-fetcher-test: From d2e76d90b55184f2446d842917d514d965f0c8fc Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 4 Sep 2026 10:07:23 +0200 Subject: [PATCH 4/5] edit lib path for docrouter Signed-off-by: Basil Bruhn --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 852e6f5..61f6a4d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -425,6 +425,7 @@ services: WEBAPP_SECURITY_AUTH_BASIC_USERNAME: psiadmin WEBAPP_SECURITY_AUTH_BASIC_PASSWORD: "$$2y$$10$$LA.TjBKRIDM/c6AJ86BZ/elpa9InzVbzqzLsyfc1Wt7h3S3N8MUPm" CLASSPATH: "/application/lib/sapjco3.jar" + LD_LIBRARY_PATH: "/usr/glibc-compat/lib:/application/lib" networks: - backend From 67e6df6ec7340084298157a03ea95ee495279eaa Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 4 Sep 2026 10:29:30 +0200 Subject: [PATCH 5/5] update lib and class for prod Signed-off-by: Basil Bruhn --- docker-compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 61f6a4d..2b74adb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -387,6 +387,8 @@ services: # Authentifizierung für WebUI WEBAPP_SECURITY_AUTH_BASIC_USERNAME: psiadmin WEBAPP_SECURITY_AUTH_BASIC_PASSWORD: "$$2y$$10$$LA.TjBKRIDM/c6AJ86BZ/elpa9InzVbzqzLsyfc1Wt7h3S3N8MUPm" + CLASSPATH: "/application/lib/sapjco3.jar" + LD_LIBRARY_PATH: "/usr/glibc-compat/lib:/application/lib" networks: - backend banf-fetcher-prod: