From a4befd5ef82bd09e913615ff7678baaf098835e9 Mon Sep 17 00:00:00 2001
From: sonny <sonnyba871@gmail.com>
Date: Mon, 5 Aug 2024 19:31:18 +0200
Subject: [PATCH] Update version & add manage_docker option

---
 tasks.yml                   | 4 ++--
 templates/docker-compose.j2 | 3 ++-
 vars/main.yml               | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tasks.yml b/tasks.yml
index 1a6c641..2dc1bc1 100644
--- a/tasks.yml
+++ b/tasks.yml
@@ -28,6 +28,7 @@
     state: absent
   environment:
     GITLAB_HOME: '{{ gitlab_home }}'
+  when: manage_docker is true
 
 - name: start gitlab
   docker_compose:
@@ -35,5 +36,4 @@
     project_src: '{{ app_dir }}'
   environment:
     GITLAB_HOME: '{{ gitlab_home }}'
-
-# TODO: update router config (for SSH)
+  when: manage_docker is true
diff --git a/templates/docker-compose.j2 b/templates/docker-compose.j2
index d5db62e..aafb86d 100644
--- a/templates/docker-compose.j2
+++ b/templates/docker-compose.j2
@@ -2,7 +2,7 @@ version: '3.6'
 services:
   web:
     image: 'gitlab/gitlab-ee:{{ image_tag }}'
-    restart: always
+    restart: unless-stopped
     hostname: '{{ hostname }}'
     environment:
       GITLAB_OMNIBUS_CONFIG: |
@@ -31,6 +31,7 @@ services:
       - '$GITLAB_HOME/data:/var/opt/gitlab'
     shm_size: '256m'
   runner:
+    # does not have an upgrade path, see https://forum.gitlab.com/t/upgrade-path-for-runner/72130
     image: 'gitlab/gitlab-runner:{{ runner_image_tag }}'
     restart: unless-stopped
     environment:
diff --git a/vars/main.yml b/vars/main.yml
index 5168913..ff6ef06 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,7 +1,8 @@
 hostname: 'git.fudiggity.nl'
 
-image_tag: '16.1.0-ee.0'
-runner_image_tag: 'alpine3.18-v16.1.0'
+manage_docker: false
+image_tag: '17.2.1-ee.0'
+runner_image_tag: 'alpine3.19-v17.1.1'
 
 app_dir: '/srv/docker/gitlab'
 gitlab_home: '{{ ansible_env.HOME }}/vm/gitlab'