From e048c5f406301da807aafe43f0a9a15b0a391fbb Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Sat, 21 Jun 2025 02:17:49 +0300 Subject: [PATCH 1/5] wip --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 25e1cd3..910cde2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,6 @@ .env /woodpecker/agent-data/ +!/woodpecker/agent-data/.gitkeep /woodpecker/server-data/ +!/woodpecker/server-data/.gitkeep From 0f1c3cb0a96c34476395194dd2e8aab76a08f12e Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Sat, 21 Jun 2025 02:18:24 +0300 Subject: [PATCH 2/5] wip --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 910cde2..23221c2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .DS_Store .env -/woodpecker/agent-data/ +/woodpecker/agent-data/**/*.* !/woodpecker/agent-data/.gitkeep -/woodpecker/server-data/ +/woodpecker/server-data/**/*.* !/woodpecker/server-data/.gitkeep From 4281130a42a7c4e68de1e1a26f93be3591168c76 Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Sat, 21 Jun 2025 02:18:29 +0300 Subject: [PATCH 3/5] wip --- woodpecker/agent-data/.gitkeep | 0 woodpecker/server-data/.gitkeep | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 woodpecker/agent-data/.gitkeep create mode 100644 woodpecker/server-data/.gitkeep diff --git a/woodpecker/agent-data/.gitkeep b/woodpecker/agent-data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/woodpecker/server-data/.gitkeep b/woodpecker/server-data/.gitkeep new file mode 100644 index 0000000..e69de29 From 631dc35ae083f0bb978da702eb0595d483936b8b Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Sat, 21 Jun 2025 02:20:01 +0300 Subject: [PATCH 4/5] wip --- .gitignore | 8 ++++---- docker-compose.yaml | 4 ++-- woodpecker/{agent-data => agent}/.gitkeep | 0 woodpecker/{server-data => server}/.gitkeep | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename woodpecker/{agent-data => agent}/.gitkeep (100%) rename woodpecker/{server-data => server}/.gitkeep (100%) diff --git a/.gitignore b/.gitignore index 23221c2..8922b40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .DS_Store .env -/woodpecker/agent-data/**/*.* -!/woodpecker/agent-data/.gitkeep -/woodpecker/server-data/**/*.* -!/woodpecker/server-data/.gitkeep +/woodpecker/agent/**/*.* +!/woodpecker/agent/.gitkeep +/woodpecker/server/**/*.* +!/woodpecker/server/.gitkeep diff --git a/docker-compose.yaml b/docker-compose.yaml index 868db81..a0a8cf0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -32,7 +32,7 @@ services: - path: ./woodpecker/.env required: false volumes: - - ./woodpecker/server-data:/var/lib/woodpecker/ + - ./woodpecker/server-data:/var/lib/woodpecker:rw woodpecker-agent: image: woodpeckerci/woodpecker-agent:v3 @@ -48,6 +48,6 @@ services: depends_on: - woodpecker-server volumes: - - ./woodpecker/agent-data:/etc/woodpecker + - ./woodpecker/agent-data:/etc/woodpecker:rw - /var/run/docker.sock:/var/run/docker.sock diff --git a/woodpecker/agent-data/.gitkeep b/woodpecker/agent/.gitkeep similarity index 100% rename from woodpecker/agent-data/.gitkeep rename to woodpecker/agent/.gitkeep diff --git a/woodpecker/server-data/.gitkeep b/woodpecker/server/.gitkeep similarity index 100% rename from woodpecker/server-data/.gitkeep rename to woodpecker/server/.gitkeep From 36c78612938667a86e9c61f9db990a1155ab7c1b Mon Sep 17 00:00:00 2001 From: Nikita Romanov Date: Sat, 21 Jun 2025 02:25:19 +0300 Subject: [PATCH 5/5] wip --- docker-compose.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a0a8cf0..f5a344b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,9 +5,6 @@ services: container_name: caddy hostname: caddy restart: always - # labels: - # logging: promtail - # logging_jobname: caddy cap_add: - NET_ADMIN ports: @@ -24,8 +21,8 @@ services: woodpecker-server: image: woodpeckerci/woodpecker-server:v3 - container_name: woodpecker-server - hostname: woodpecker-server + container_name: server + hostname: server env_file: - path: ./woodpecker/.default.env required: true @@ -36,8 +33,8 @@ services: woodpecker-agent: image: woodpeckerci/woodpecker-agent:v3 - container_name: woodpecker-agent - hostname: woodpecker-agent + container_name: agent + hostname: agent command: agent restart: always env_file: