From ae5281587671223eb51b2b10df8a021019d27614 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Sun, 22 Jan 2023 19:21:02 +0100
Subject: [PATCH] Woodpecker server and agent always have the same version

    https://github.com/woodpecker-ci/woodpecker/blob/master/.woodpecker/docker.yml
---
 roles/docker/defaults/main.yml             | 3 +--
 roles/docker/tasks/services/woodpecker.yml | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index b162d64..610257d 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -167,8 +167,7 @@ services:
     file: woodpecker.yml
     domain: "ci.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/woodpecker"
-    server_version: v0.15
-    agent_version: v0.15
+    version: v0.15
 
   mailu:
     file: mailu.yml
diff --git a/roles/docker/tasks/services/woodpecker.yml b/roles/docker/tasks/services/woodpecker.yml
index 8cdf7ae..6128842 100644
--- a/roles/docker/tasks/services/woodpecker.yml
+++ b/roles/docker/tasks/services/woodpecker.yml
@@ -8,7 +8,7 @@
       version: "3.8"
       services:
         server:
-          image: "woodpeckerci/woodpecker-server:{{ services.woodpecker.server_version }}"
+          image: "woodpeckerci/woodpecker-server:{{ services.woodpecker.version }}"
           restart: always
           networks:
             - default
@@ -28,7 +28,7 @@
             LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
 
         agent:
-          image: "woodpeckerci/woodpecker-agent:{{ services.woodpecker.agent_version }}"
+          image: "woodpeckerci/woodpecker-agent:{{ services.woodpecker.version }}"
           restart: always
           volumes:
             - "/var/run/docker.sock:/var/run/docker.sock"