Update version & add manage_docker option
This commit is contained in:
parent
ab7c91f637
commit
a4befd5ef8
3 changed files with 7 additions and 5 deletions
|
|
@ -28,6 +28,7 @@
|
||||||
state: absent
|
state: absent
|
||||||
environment:
|
environment:
|
||||||
GITLAB_HOME: '{{ gitlab_home }}'
|
GITLAB_HOME: '{{ gitlab_home }}'
|
||||||
|
when: manage_docker is true
|
||||||
|
|
||||||
- name: start gitlab
|
- name: start gitlab
|
||||||
docker_compose:
|
docker_compose:
|
||||||
|
|
@ -35,5 +36,4 @@
|
||||||
project_src: '{{ app_dir }}'
|
project_src: '{{ app_dir }}'
|
||||||
environment:
|
environment:
|
||||||
GITLAB_HOME: '{{ gitlab_home }}'
|
GITLAB_HOME: '{{ gitlab_home }}'
|
||||||
|
when: manage_docker is true
|
||||||
# TODO: update router config (for SSH)
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ version: '3.6'
|
||||||
services:
|
services:
|
||||||
web:
|
web:
|
||||||
image: 'gitlab/gitlab-ee:{{ image_tag }}'
|
image: 'gitlab/gitlab-ee:{{ image_tag }}'
|
||||||
restart: always
|
restart: unless-stopped
|
||||||
hostname: '{{ hostname }}'
|
hostname: '{{ hostname }}'
|
||||||
environment:
|
environment:
|
||||||
GITLAB_OMNIBUS_CONFIG: |
|
GITLAB_OMNIBUS_CONFIG: |
|
||||||
|
|
@ -31,6 +31,7 @@ services:
|
||||||
- '$GITLAB_HOME/data:/var/opt/gitlab'
|
- '$GITLAB_HOME/data:/var/opt/gitlab'
|
||||||
shm_size: '256m'
|
shm_size: '256m'
|
||||||
runner:
|
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 }}'
|
image: 'gitlab/gitlab-runner:{{ runner_image_tag }}'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
hostname: 'git.fudiggity.nl'
|
hostname: 'git.fudiggity.nl'
|
||||||
|
|
||||||
image_tag: '16.1.0-ee.0'
|
manage_docker: false
|
||||||
runner_image_tag: 'alpine3.18-v16.1.0'
|
image_tag: '17.2.1-ee.0'
|
||||||
|
runner_image_tag: 'alpine3.19-v17.1.1'
|
||||||
|
|
||||||
app_dir: '/srv/docker/gitlab'
|
app_dir: '/srv/docker/gitlab'
|
||||||
gitlab_home: '{{ ansible_env.HOME }}/vm/gitlab'
|
gitlab_home: '{{ ansible_env.HOME }}/vm/gitlab'
|
||||||
|
|
|
||||||
Reference in a new issue