Skip to content

Commit

Permalink
feat: update docker components to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
chronicc committed Oct 3, 2024
1 parent 20ebcba commit 108ee90
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 78 deletions.
8 changes: 3 additions & 5 deletions playbooks/10-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@

# ---( Features )---

# Don't use the geerlinguy.docker here since docker-compose
# needs to be installed with pip for the docker_compose module to work.
- name: Import docker (Linux)
ansible.builtin.import_tasks:
file: features/docker_linux.yml
ansible.builtin.import_role:
name: geerlingguy.docker
when:
- ansible_system == 'Linux'
- feature_docker | default(false)
Expand Down Expand Up @@ -226,7 +224,7 @@
- docker

- name: Restart loki
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: '{{ f_docker__home }}/loki'
restarted: true
tags:
Expand Down
9 changes: 5 additions & 4 deletions playbooks/20-setup-minecraft-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
serial: 10
pre_tasks:
- name: Include OS-specific variables.
- name: Include OS-specific variables
ansible.builtin.include_vars: '{{ item }}'
with_first_found:
- files:
Expand All @@ -17,14 +17,15 @@

tasks:
- name: Import docker (Linux)
ansible.builtin.import_tasks:
file: features/docker_linux.yml
ansible.builtin.import_role:
name: geerlingguy.docker
when:
- ansible_system == 'Linux'
- feature_docker | default(false)
tags:
- docker

- name: Import minecraft tasks.
- name: Import minecraft tasks
ansible.builtin.import_tasks:
file: applications/minecraft-server.yml
when:
Expand Down
9 changes: 5 additions & 4 deletions playbooks/20-setup-valheim-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
become: true
serial: 10
pre_tasks:
- name: Include OS-specific variables.
- name: Include OS-specific variables
ansible.builtin.include_vars: '{{ item }}'
with_first_found:
- files:
Expand All @@ -17,14 +17,15 @@

tasks:
- name: Import docker (Linux)
ansible.builtin.import_tasks:
file: features/docker_linux.yml
ansible.builtin.import_role:
name: geerlingguy.docker
when:
- ansible_system == 'Linux'
- feature_docker | default(false)
tags:
- docker

- name: Import valheim tasks.
- name: Import valheim tasks
ansible.builtin.import_tasks:
file: applications/valheim-server.yml
when:
Expand Down
2 changes: 1 addition & 1 deletion playbooks/applications/baserow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: baserow // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/baserow"
2 changes: 1 addition & 1 deletion playbooks/applications/kimai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: kimai // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/kimai"
2 changes: 1 addition & 1 deletion playbooks/applications/kuchen.cafe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
when: _plugins.changed or _themes.changed

- name: kuchen.cafe // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/kuchen.cafe"
recreate: "{{ _recreate }}"
2 changes: 1 addition & 1 deletion playbooks/applications/loki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
mode: "0644"

- name: loki // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/loki"
2 changes: 1 addition & 1 deletion playbooks/applications/matrixhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: matrixhook // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/matrixhook"
2 changes: 1 addition & 1 deletion playbooks/applications/mattermost-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: mattermost-server // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/mattermost"
2 changes: 1 addition & 1 deletion playbooks/applications/minecraft-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: minecraft // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/minecraft"
4 changes: 2 additions & 2 deletions playbooks/applications/nextcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
backup: true

- name: nextcloud // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/nextcloud"
when: not force_update | default(false)

- name: nextcloud // Update deployment (forced)
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/nextcloud"
pull: true
when: force_update | default(false)
2 changes: 1 addition & 1 deletion playbooks/applications/nocobase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: nocobase // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/nocobase"
2 changes: 1 addition & 1 deletion playbooks/applications/roundcube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
mode: "0644"

- name: roundcube // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/roundcube"
2 changes: 1 addition & 1 deletion playbooks/applications/teamspeak-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: teamspeak-server // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/teamspeak"
2 changes: 1 addition & 1 deletion playbooks/applications/valheim-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
mode: "0644"

- name: valheim // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/valheim"
50 changes: 0 additions & 50 deletions playbooks/features/docker_linux.yml

This file was deleted.

2 changes: 1 addition & 1 deletion playbooks/features/traefik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
mode: "0644"

- name: traefik // Update deployment
community.docker.docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ f_docker__home }}/traefik"
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ roles:
- name: ctorgalson.nerdfonts
version: v1.0.1
- name: geerlingguy.docker
version: 6.2.0
version: 7.4.1
- name: derJD.journald
version: 0.0.1

0 comments on commit 108ee90

Please sign in to comment.