From 0661847299c941c1ccb888b576261be62fcb1c9f Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 7 Nov 2025 09:08:24 +0100 Subject: [PATCH] remove all woodpecker containers and nginx config Signed-off-by: Basil Bruhn --- conf.d/woodpecker-test.conf | 21 ------------------- docker-compose.yaml | 41 +------------------------------------ 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 conf.d/woodpecker-test.conf diff --git a/conf.d/woodpecker-test.conf b/conf.d/woodpecker-test.conf deleted file mode 100644 index df81b84..0000000 --- a/conf.d/woodpecker-test.conf +++ /dev/null @@ -1,21 +0,0 @@ -server { - listen 80; - server_name woodpecker-test.psi.ch; - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name woodpecker-test.psi.ch; - - ssl_certificate /etc/nginx/certs/woodpecker-test.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/woodpecker-test.psi.ch.key; - - location / { - proxy_pass http://woodpecker_server:8000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } -} diff --git a/docker-compose.yaml b/docker-compose.yaml index f1e3d1f..b87386f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -140,7 +140,7 @@ services: opticswiki: image: gitea.psi.ch/images/opticswiki:1 container_name: opticswiki - restart: always + 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 @@ -149,44 +149,6 @@ services: networks: - backend - # Sven Augustin -Hax0rL0rd - # CI/CD Aaddition to Gitea (Jenkins for poor people) - woodpecker-server: - image: woodpeckerci/woodpecker-server:next - container_name: woodpecker_server - restart: always - ports: - - 8000:8000 - volumes: - - /opt/webcontent/woodpecker/server:/var/lib/woodpecker/ - environment: - - WOODPECKER_OPEN=true - - WOODPECKER_HOST=https://woodpecker-test.psi.ch - - WOODPECKER_AGENT_SECRET={{ WOODPECKER_AGENT_SECRET }} - - WOODPECKER_GITEA=true - - WOODPECKER_GITEA_URL=https://gitea-test.psi.ch - - WOODPECKER_GITEA_CLIENT={{ WOODPECKER_GITEA_CLIENT }} - - WOODPECKER_GITEA_SECRET={{ WOODPECKER_GITEA_SECRET }} - networks: - - backend - - woodpecker_backend - - woodpecker-agent: - image: woodpeckerci/woodpecker-agent:next - container_name: woodpecker_agent - command: agent - restart: always - depends_on: - - woodpecker-server - volumes: - - /opt/webcontent/woodpecker/agent/woodpecker:/etc/woodpecker - - /var/run/docker.sock:/var/run/docker.sock - environment: - - WOODPECKER_SERVER=woodpecker-server:9000 - - WOODPECKER_AGENT_SECRET={{ WOODPECKER_AGENT_SECRET }} - networks: - - woodpecker_backend - # Angelo Sozzi INC0150655 angelo.sozzi@psi.ch # POC Software - might be installed on docker-dmz n8n: @@ -319,7 +281,6 @@ networks: public: backend: hedgedoc_backend: - woodpecker_backend: it_strategy_dashboard_backend: panda_maintenance_backend: