Compare commits

..

No commits in common. "36c78612938667a86e9c61f9db990a1155ab7c1b" and "28d64854f03a3bf69b1e4af4faebc0bc0bf85cd8" have entirely different histories.

4 changed files with 11 additions and 10 deletions

6
.gitignore vendored
View file

@ -2,7 +2,5 @@
.DS_Store .DS_Store
.env .env
/woodpecker/agent/**/*.* /woodpecker/agent-data/
!/woodpecker/agent/.gitkeep /woodpecker/server-data/
/woodpecker/server/**/*.*
!/woodpecker/server/.gitkeep

View file

@ -5,6 +5,9 @@ services:
container_name: caddy container_name: caddy
hostname: caddy hostname: caddy
restart: always restart: always
# labels:
# logging: promtail
# logging_jobname: caddy
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
ports: ports:
@ -21,20 +24,20 @@ services:
woodpecker-server: woodpecker-server:
image: woodpeckerci/woodpecker-server:v3 image: woodpeckerci/woodpecker-server:v3
container_name: server container_name: woodpecker-server
hostname: server hostname: woodpecker-server
env_file: env_file:
- path: ./woodpecker/.default.env - path: ./woodpecker/.default.env
required: true required: true
- path: ./woodpecker/.env - path: ./woodpecker/.env
required: false required: false
volumes: volumes:
- ./woodpecker/server-data:/var/lib/woodpecker:rw - ./woodpecker/server-data:/var/lib/woodpecker/
woodpecker-agent: woodpecker-agent:
image: woodpeckerci/woodpecker-agent:v3 image: woodpeckerci/woodpecker-agent:v3
container_name: agent container_name: woodpecker-agent
hostname: agent hostname: woodpecker-agent
command: agent command: agent
restart: always restart: always
env_file: env_file:
@ -45,6 +48,6 @@ services:
depends_on: depends_on:
- woodpecker-server - woodpecker-server
volumes: volumes:
- ./woodpecker/agent-data:/etc/woodpecker:rw - ./woodpecker/agent-data:/etc/woodpecker
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock