From 65713f5114bd8cba4da4dd2b0ebdc67eb6f71494 Mon Sep 17 00:00:00 2001 From: flechsig Date: Tue, 11 Nov 2025 10:22:56 +0100 Subject: [PATCH 1/3] clean up comments; new image with version 1.1 --- docker-compose.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b87386f..410c508 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -134,11 +134,10 @@ services: # 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) + # fill webcontent: # gitea.psi.ch/optics/opticswiki/ => make initvolumes opticswiki: - image: gitea.psi.ch/images/opticswiki:1 + image: gitea.psi.ch/images/opticswiki:1.1 container_name: opticswiki restart: always volumes: From b1467fcbce7a4c570106d26cb6f7b8b946685099 Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 27 Nov 2025 08:56:09 +0100 Subject: [PATCH 2/3] update comments, new image version 1.2 --- conf.d/opticswiki.conf | 1 - docker-compose.yaml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index 0090bac..9401843 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -1,5 +1,4 @@ # opticswiki conf for nginx -# cloned from gfa-status-test.conf server { listen 80; diff --git a/docker-compose.yaml b/docker-compose.yaml index 410c508..09ef5dd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -134,10 +134,10 @@ services: # Flechsig Uwe # opticswiki (test setup) - # fill webcontent: - # gitea.psi.ch/optics/opticswiki/ => make initvolumes + # webcontent: + # lx-fs-01.psi.ch:/lx_webhosting opticswiki: - image: gitea.psi.ch/images/opticswiki:1.1 + image: gitea.psi.ch/images/opticswiki:1.2 container_name: opticswiki restart: always volumes: From 8265fd6c2f163c69513ee30c89126bd7ce248d57 Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 27 Nov 2025 09:40:30 +0100 Subject: [PATCH 3/3] change comment --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4cfd6d4..02cff27 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -142,7 +142,7 @@ services: # Flechsig Uwe # opticswiki (test setup) # webcontent: - # lx-fs-01.psi.ch:/lx_webhosting + # lx-fs-01.psi.ch:/lx_webhosting opticswiki: image: gitea.psi.ch/images/opticswiki:1.2 container_name: opticswiki