From d7225969d8ee9fcc2150eb0b32472c425c837eb2 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Tue, 8 Jul 2025 15:57:43 +0200 Subject: [PATCH 1/2] woodpecker Signed-off-by: Basil Bruhn --- conf.d/woodpecker-test.conf | 21 ++++++++++++++++++++ docker-compose.yaml | 38 ++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 conf.d/woodpecker-test.conf diff --git a/conf.d/woodpecker-test.conf b/conf.d/woodpecker-test.conf new file mode 100644 index 0000000..df81b84 --- /dev/null +++ b/conf.d/woodpecker-test.conf @@ -0,0 +1,21 @@ +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 9e8f1c9..ca9e2f2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -110,8 +110,44 @@ services: networks: - backend + # Sven Augustin -Hax0rL0rd + woodpecker-server: + image: woodpeckerci/woodpecker-server:next + container_name: woodpecker_server + ports: + - 8000:8000 + volumes: + - /opt/webhosting/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/webhosting/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 + networks: public: backend: hedgedoc_backend: - + woodpecker_backend: From 708113d9e10b64ddbf2d0685f37e16ad2d923edc Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Thu, 10 Jul 2025 11:19:45 +0200 Subject: [PATCH 2/2] typo Signed-off-by: Basil Bruhn --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index ca9e2f2..425bdb3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -117,7 +117,7 @@ services: ports: - 8000:8000 volumes: - - /opt/webhosting/woodpecker/server:/var/lib/woodpecker/ + - /opt/webcontent/woodpecker/server:/var/lib/woodpecker/ environment: - WOODPECKER_OPEN=true - WOODPECKER_HOST=https://woodpecker-test.psi.ch @@ -138,7 +138,7 @@ services: depends_on: - woodpecker-server volumes: - - /opt/webhosting/woodpecker/agent/woodpecker:/etc/woodpecker + - /opt/webcontent/woodpecker/agent/woodpecker:/etc/woodpecker - /var/run/docker.sock:/var/run/docker.sock environment: - WOODPECKER_SERVER=woodpecker-server:9000