From db186d3f7987591b711cd383a1d947ea84167c89 Mon Sep 17 00:00:00 2001
From: saibotk <git@saibotk.de>
Date: Tue, 30 Nov 2021 21:00:22 +0100
Subject: [PATCH] minecraft: Fix default values for image & actually use tag in
 compose

---
 roles/minecraft/defaults/main.yml            | 4 ++--
 roles/minecraft/templates/docker-compose.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/minecraft/defaults/main.yml b/roles/minecraft/defaults/main.yml
index 78c7dc5..e2b0734 100644
--- a/roles/minecraft/defaults/main.yml
+++ b/roles/minecraft/defaults/main.yml
@@ -25,10 +25,10 @@ minecraft_rcon_location: "{{ minecraft_install_location }}/rcon"
 minecraft_backup_location: "{{ minecraft_install_location }}/worlds"
 
 # renovate: depName=docker.io/itzg/minecraft-server
-minecraft_image_version: "2021.22.0"
+minecraft_image_version: "latest"
 
 # Container versions
-minecraft_image_tag: "{{ minecraft_image_version }}-java17"
+minecraft_image_tag: "{{ minecraft_image_version }}"
 
 # The minecraft server port that should be exposed
 minecraft_server_port: 25565
diff --git a/roles/minecraft/templates/docker-compose.yml b/roles/minecraft/templates/docker-compose.yml
index 6e4c8ff..b3f03fb 100644
--- a/roles/minecraft/templates/docker-compose.yml
+++ b/roles/minecraft/templates/docker-compose.yml
@@ -21,7 +21,7 @@ version: '2.1'
 
 services:
   minecraft:
-    image: docker.io/itzg/minecraft-server
+    image: docker.io/itzg/minecraft-server:{{ minecraft_image_tag }}
     ports:
       - "{{ minecraft_server_port }}:25565"
     volumes: