From c6f3e708ffa2b5d45b4513635cb1ce7fede882ce Mon Sep 17 00:00:00 2001
From: ange <ange@yw5n.com>
Date: Wed, 7 Feb 2024 09:02:14 +0100
Subject: [PATCH] fix(woodpecker): variables and container names

---
 woodpecker/.env         |  6 +++++-
 woodpecker/compose.yaml | 16 ++++++++--------
 woodpecker/nginx.conf   |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/woodpecker/.env b/woodpecker/.env
index e2a0b35..795e316 100644
--- a/woodpecker/.env
+++ b/woodpecker/.env
@@ -1,4 +1,8 @@
-BASE_URL=build.
+BASE_URL=cicd.
 EMAIL=
 
 WOODPECKER_AGENT_SECRET=    #$(openssl rand -hex 32)
+WOODPECKER_GITEA=true
+WOODPECKER_GITEA_URL=
+WOODPECKER_GITEA_CLIENT=
+WOODPECKER_GITEA_SECRET=
diff --git a/woodpecker/compose.yaml b/woodpecker/compose.yaml
index 01dac03..11da7d9 100644
--- a/woodpecker/compose.yaml
+++ b/woodpecker/compose.yaml
@@ -12,32 +12,32 @@ services:
       - certbotroot:/var/www/certbot/
       - /var/run/docker.sock:/var/run/docker.sock
 
-  server:
+  woodpecker-server:
     image: docker.io/woodpeckerci/woodpecker-server:v2.0.0
     restart: unless-stopped
     volumes:
       - server-data:/var/lib/woodpecker/
+    env_file:
+      - .env
     environment:
       - WOODPECKER_OPEN=true
-      - WOODPECKER_HOST=$BASE_URL
-      - WOODPECKER_GITEA=true
-      - WOODPECKER_AGENT_SECRET
+      - WOODPECKER_HOST=https://$BASE_URL
     networks:
       - nginx
       - default
 
-  agent:
+  woodpecker-agent:
     image: docker.io/woodpeckerci/woodpecker-agent:v2.0.0
     restart: unless-stopped
     command: agent
     volumes:
-      - agent-config:/etc/woodpecker
+      - agent-config:/etc/woodpecker/
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - WOODPECKER_SERVER=server:9000
+      - WOODPECKER_SERVER=woodpecker-server:9000
       - WOODPECKER_AGENT_SECRET
     depends_on:
-      - server
+      - woodpecker-server
 
 
 volumes:
diff --git a/woodpecker/nginx.conf b/woodpecker/nginx.conf
index 2aa1edf..4f00608 100644
--- a/woodpecker/nginx.conf
+++ b/woodpecker/nginx.conf
@@ -16,7 +16,7 @@ server {
 
 
     location / {
-        proxy_pass http://woodpecker:8000;
+        proxy_pass http://woodpecker-server:8000;
 
         proxy_set_header X-Forwarded-For   $remote_addr;
         proxy_set_header X-Forwarded-Proto $scheme;