Fix webhook allowed hosts and update networking configuration
All checks were successful
ci/woodpecker/push/build Pipeline was successful
All checks were successful
ci/woodpecker/push/build Pipeline was successful
- Add GITEA__webhook__ALLOWED_HOST_LIST to allow webhook delivery to Woodpecker - Add intrastack network to all services for internal communication - Update Woodpecker images from v2.7.3 to v3.3.0 - Fix Docker socket path for rootless Docker (/run/user/1000/docker.sock) - Add extra_hosts for gitea domain resolution - Configure WOODPECKER_BACKEND_DOCKER_NETWORK for proper container networking
This commit is contained in:
46
compose.yml
46
compose.yml
@@ -1,8 +1,15 @@
|
|||||||
|
networks:
|
||||||
|
intrastack:
|
||||||
|
driver: bridge
|
||||||
|
internal: false
|
||||||
|
|
||||||
services:
|
services:
|
||||||
rustfs:
|
rustfs:
|
||||||
image: localhost:3000/homelab/rustfs:latest
|
image: localhost:3000/homelab/rustfs:latest
|
||||||
container_name: rustfs
|
container_name: rustfs
|
||||||
user: "10001:10001"
|
user: "10001:10001"
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
environment:
|
environment:
|
||||||
- RUSTFS_ACCESS_KEY=${RUSTFS_ACCESS_KEY}
|
- RUSTFS_ACCESS_KEY=${RUSTFS_ACCESS_KEY}
|
||||||
- RUSTFS_SECRET_KEY=${RUSTFS_SECRET_KEY}
|
- RUSTFS_SECRET_KEY=${RUSTFS_SECRET_KEY}
|
||||||
@@ -19,6 +26,8 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
image: localhost:3000/homelab/postgresql:latest
|
image: localhost:3000/homelab/postgresql:latest
|
||||||
container_name: postgres
|
container_name: postgres
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
environment:
|
environment:
|
||||||
- POSTGRESQL_PASSWORD=${POSTGRES_PASSWORD:-changeme}
|
- POSTGRESQL_PASSWORD=${POSTGRES_PASSWORD:-changeme}
|
||||||
- POSTGRESQL_DATABASE=gitea
|
- POSTGRESQL_DATABASE=gitea
|
||||||
@@ -33,6 +42,8 @@ services:
|
|||||||
gitea:
|
gitea:
|
||||||
image: localhost:3000/homelab/gitea:latest-rootless
|
image: localhost:3000/homelab/gitea:latest-rootless
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
environment:
|
environment:
|
||||||
- GITEA__database__DB_TYPE=postgres
|
- GITEA__database__DB_TYPE=postgres
|
||||||
- GITEA__database__HOST=postgres:5432
|
- GITEA__database__HOST=postgres:5432
|
||||||
@@ -61,6 +72,7 @@ services:
|
|||||||
- GITEA__server__DOMAIN=gitea.home.fhirworx.io
|
- GITEA__server__DOMAIN=gitea.home.fhirworx.io
|
||||||
- GITEA__server__ROOT_URL=http://gitea.home.fhirworx.io:3000/
|
- GITEA__server__ROOT_URL=http://gitea.home.fhirworx.io:3000/
|
||||||
- GITEA__server__SSH_DOMAIN=gitea.home.fhirworx.io
|
- GITEA__server__SSH_DOMAIN=gitea.home.fhirworx.io
|
||||||
|
- GITEA__webhook__ALLOWED_HOST_LIST=woodpecker-server,ci.home.fhirworx.io,192.168.1.192,172.19.0.0/16
|
||||||
volumes:
|
volumes:
|
||||||
- gitea_data:/var/lib/gitea
|
- gitea_data:/var/lib/gitea
|
||||||
- gitea_config:/etc/gitea
|
- gitea_config:/etc/gitea
|
||||||
@@ -73,19 +85,22 @@ services:
|
|||||||
security_opt:
|
security_opt:
|
||||||
- no-new-privileges:true
|
- no-new-privileges:true
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
woodpecker-server:
|
woodpecker-server:
|
||||||
image: localhost:3000/homelab/woodpecker-server:v2.7.3
|
image: woodpeckerci/woodpecker-server:v3.3.0
|
||||||
container_name: woodpecker-server
|
container_name: woodpecker-server
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
|
extra_hosts:
|
||||||
|
- "gitea.home.fhirworx.io:192.168.1.192"
|
||||||
environment:
|
environment:
|
||||||
- WOODPECKER_HOST=http://ci.home.fhirworx.io:8000
|
- WOODPECKER_HOST=http://ci.home.fhirworx.io:8000
|
||||||
- WOODPECKER_WEBHOOK_HOST=http://woodpecker-server:8000
|
- WOODPECKER_GRPC_ADDR=:9000
|
||||||
- WOODPECKER_LOG_LEVEL=debug
|
- WOODPECKER_LOG_LEVEL=debug
|
||||||
- WOODPECKER_ADMIN=kert
|
- WOODPECKER_ADMIN=kert
|
||||||
- WOODPECKER_PLUGINS_PRIVILEGED=true
|
|
||||||
- WOODPECKER_ESCALATE=docker:cli,docker:dind,docker
|
|
||||||
- WOODPECKER_OPEN=true
|
- WOODPECKER_OPEN=true
|
||||||
- WOODPECKER_GITEA=true
|
- WOODPECKER_GITEA=true
|
||||||
- WOODPECKER_GITEA_URL=http://gitea:3000
|
- WOODPECKER_GITEA_URL=http://gitea.home.fhirworx.io:3000
|
||||||
- WOODPECKER_GITEA_CLIENT=${WOODPECKER_GITEA_CLIENT}
|
- WOODPECKER_GITEA_CLIENT=${WOODPECKER_GITEA_CLIENT}
|
||||||
- WOODPECKER_GITEA_SECRET=${WOODPECKER_GITEA_SECRET}
|
- WOODPECKER_GITEA_SECRET=${WOODPECKER_GITEA_SECRET}
|
||||||
- WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}
|
- WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}
|
||||||
@@ -98,29 +113,33 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- gitea
|
- gitea
|
||||||
- postgres
|
- postgres
|
||||||
security_opt:
|
|
||||||
- no-new-privileges:true
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
woodpecker-agent:
|
woodpecker-agent:
|
||||||
image: localhost:3000/homelab/woodpecker-agent:v2.7.3
|
image: woodpeckerci/woodpecker-agent:v3.3.0
|
||||||
container_name: woodpecker-agent
|
container_name: woodpecker-agent
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
|
privileged: true
|
||||||
environment:
|
environment:
|
||||||
- WOODPECKER_SERVER=woodpecker-server:9000
|
- WOODPECKER_SERVER=woodpecker-server:9000
|
||||||
- WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}
|
- WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}
|
||||||
- WOODPECKER_MAX_WORKFLOWS=4
|
- WOODPECKER_MAX_WORKFLOWS=4
|
||||||
- DOCKER_HOST=unix:///var/run/docker.sock
|
- WOODPECKER_BACKEND=docker
|
||||||
|
- WOODPECKER_BACKEND_DOCKER_NETWORK=stack_intrastack
|
||||||
|
- DOCKER_API_VERSION=1.44
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /run/user/1000/docker.sock:/var/run/docker.sock
|
||||||
|
- woodpecker_agent_config:/etc/woodpecker
|
||||||
depends_on:
|
depends_on:
|
||||||
- woodpecker-server
|
- woodpecker-server
|
||||||
security_opt:
|
|
||||||
- no-new-privileges:true
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
notebooks:
|
notebooks:
|
||||||
image: localhost:3000/homelab/notebooks:latest
|
image: localhost:3000/homelab/notebooks:latest
|
||||||
container_name: notebooks
|
container_name: notebooks
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
ports:
|
ports:
|
||||||
- "2718:2718"
|
- "2718:2718"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -139,6 +158,8 @@ services:
|
|||||||
zotero:
|
zotero:
|
||||||
image: localhost:3000/homelab/zotero:latest
|
image: localhost:3000/homelab/zotero:latest
|
||||||
container_name: zotero
|
container_name: zotero
|
||||||
|
networks:
|
||||||
|
- intrastack
|
||||||
runtime: nvidia
|
runtime: nvidia
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
tty: true
|
tty: true
|
||||||
@@ -177,3 +198,4 @@ volumes:
|
|||||||
gitea_data:
|
gitea_data:
|
||||||
gitea_config:
|
gitea_config:
|
||||||
woodpecker_data:
|
woodpecker_data:
|
||||||
|
woodpecker_agent_config:
|
||||||
|
|||||||
Reference in New Issue
Block a user