From ef30ebf83421b0b8774dc931491e20c7901037f0 Mon Sep 17 00:00:00 2001 From: flechsig Date: Tue, 7 Oct 2025 10:44:54 +0200 Subject: [PATCH] moved opticswiki after gfa-status-test since Im not sure about the correct intention after woodpecker --- docker-compose.yaml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b2039ed..899f367 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -130,6 +130,23 @@ services: networks: - backend + # Flechsig Uwe + # opticswiki (test setup) + # I assume gitea.psi.ch/images is the local image repository filled docker push + # /opt/webcontent/opticswiki must be filled once (before starting the container) + # gitea.psi.ch/optics/opticswiki/ => make initvolumes + opticswiki: + image: gitea.psi.ch/images/opticswiki + container_name: opticswiki + restart: always + volumes: + - /opt/webcontent/opticswiki/data:/usr/local/apache2/Foswiki-2.1.9/data + - /opt/webcontent/opticswiki/pub:/usr/local/apache2/Foswiki-2.1.9/pub + - /opt/webcontent/opticswiki/working:/usr/local/apache2/Foswiki-2.1.9/working + - /opt/webcontent/opticswiki/lib:/usr/local/apache2/Foswiki-2.1.9/lib + networks: + - backend + # Sven Augustin -Hax0rL0rd # CI/CD Aaddition to Gitea (Jenkins for poor people) woodpecker-server: @@ -249,16 +266,5 @@ networks: woodpecker_backend: it_strategy_dashboard_backend: - # Flechsig Uwe - # opticswiki (test setup) - opticswiki: - image: gitea.psi.ch/images/elog:3.1.5 - container_name: opticswiki - restart: always - volumes: - - /opt/logbooks/LMU:/usr/local/elog/logbooks - - /opt/webcontent/LMU/elog.cfg:/usr/local/elog/elogd.cfg - networks: - - backend