Convert scripts to docker-compose

2026-01-22 18:07:05 +00:00 · 2025-11-24 13:36:24 +00:00 · 2025-11-24 13:36:24 +00:00 · c7c4340732
commit c7c4340732
parent 78bfaede9a
40 changed files with 48 additions and 60 deletions
--- a/ansible/group_vars/all/docker.yml
+++ b/ansible/group_vars/all/docker.yml
@ -8,11 +8,6 @@ docker_users:
 docker_compose_file_mask: "664"
 docker_compose_directory_mask: "775"

-# HACK: Use compose-switch as the install for compose, so the commands still work.
-# Run this task manually, as version comparisons usually fail
-docker_compose_url: https://github.com/docker/compose-switch/releases/latest/download/docker-compose-linux-{{ docker_apt_arch }}
-docker_install_compose: false
-
 docker_install_compose_plugin: "{{ ansible_os_family == 'Debian' }}"

-docker_update_command: docker-compose pull && docker-compose down --remove-orphans && docker-compose rm && docker-compose up -d
+docker_update_command: docker compose pull && docker compose down --remove-orphans && docker compose rm && docker compose up -d
--- a/ansible/roles/atuin/tasks/main.yml
+++ b/ansible/roles/atuin/tasks/main.yml
@ -12,5 +12,5 @@
    dest: /opt/atuin/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart atuin
--- a/ansible/roles/baby_buddy/tasks/main.yml
+++ b/ansible/roles/baby_buddy/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/baby-buddy/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart baby-buddy
--- a/ansible/roles/bsky/tasks/main.yml
+++ b/ansible/roles/bsky/tasks/main.yml
@ -22,5 +22,5 @@
    dest: /opt/bsky/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart bsky
--- a/ansible/roles/comentario/tasks/main.yml
+++ b/ansible/roles/comentario/tasks/main.yml
@ -14,7 +14,7 @@
    dest: /opt/comentario/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart comentario

 - name: Install secrets
--- a/ansible/roles/db_auto_backup/tasks/main.yml
+++ b/ansible/roles/db_auto_backup/tasks/main.yml
@ -11,5 +11,5 @@
    dest: /opt/db-auto-backup/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart db-auto-backup
--- a/ansible/roles/docker_cleanup/files/docker-utils/dc
+++ b/ansible/roles/docker_cleanup/files/docker-utils/dc
@ -2,4 +2,4 @@

 set -e

-exec docker-compose -f "/opt/$1/docker-compose.yml" "${@:2}"
+exec docker compose -f "/opt/$1/docker-compose.yml" "${@:2}"
--- a/ansible/roles/docker_cleanup/files/docker-utils/dc-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/dc-all
@ -3,5 +3,5 @@
 set -e

 for compose_file in /opt/**/docker-compose.yml; do
-    docker-compose -f "$compose_file" "$@"
+    docker compose -f "$compose_file" "$@"
 done
--- a/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all
@ -3,9 +3,9 @@
 set -e

 for compose_file in /opt/**/docker-compose.yml; do
-    if [[ $(docker-compose -f "$compose_file" ps -q) ]]; then
-        docker-compose -f "$compose_file" down --remove-orphans
-        docker-compose -f "$compose_file" up -d
+    if [[ $(docker compose -f "$compose_file" ps -q) ]]; then
+        docker compose -f "$compose_file" down --remove-orphans
+        docker compose -f "$compose_file" up -d
    else
        echo "> Skipping $compose_file as it's not running."
    fi
--- a/ansible/roles/docker_cleanup/files/docker-utils/update-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/update-all
@ -3,10 +3,10 @@
 set -e

 for compose_file in /opt/**/docker-compose.yml; do
-    if [[ $(docker-compose -f "$compose_file" ps -q) ]]; then
+    if [[ $(docker compose -f "$compose_file" ps -q) ]]; then
        echo "> Updating $compose_file"
-        docker-compose -f "$compose_file" pull
-        docker-compose -f "$compose_file" up -d --remove-orphans
+        docker compose -f "$compose_file" pull
+        docker compose -f "$compose_file" up -d --remove-orphans
    else
        echo "> Skipping $compose_file as it's not running."
    fi
--- a/ansible/roles/docker_cleanup/tasks/main.yml
+++ b/ansible/roles/docker_cleanup/tasks/main.yml
@ -3,13 +3,6 @@
    name: docker-compose
  when: ansible_os_family != 'Debian'

- name: Install compose-switch
-  get_url:
-    url: "{{ docker_compose_url }}"
-    dest: "{{ docker_compose_path }}"
-    mode: "0755"
-  when: ansible_os_family == 'Debian'
-
 - name: Create docker group
  group:
    name: "{{ docker_user.name }}"
--- a/ansible/roles/forgejo/tasks/main.yml
+++ b/ansible/roles/forgejo/tasks/main.yml
@ -14,7 +14,7 @@
    dest: /opt/gitea/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart gitea

 - name: Install config file
--- a/ansible/roles/forgejo_runner/tasks/main.yml
+++ b/ansible/roles/forgejo_runner/tasks/main.yml
@ -19,5 +19,5 @@
    dest: /opt/forgejo-runner/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart forgejo-runner
--- a/ansible/roles/freshrss/tasks/main.yml
+++ b/ansible/roles/freshrss/tasks/main.yml
@ -22,7 +22,7 @@
    dest: /opt/freshrss/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart freshrss

 - name: Install three panes extension
--- a/ansible/roles/immich/tasks/main.yml
+++ b/ansible/roles/immich/tasks/main.yml
@ -11,7 +11,7 @@
    dest: /opt/immich/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart immich

 - name: Install IPP config
--- a/ansible/roles/karakeep/tasks/main.yml
+++ b/ansible/roles/karakeep/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/karakeep/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart karakeep
--- a/ansible/roles/macau/tasks/main.yml
+++ b/ansible/roles/macau/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/macau/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart macau
--- a/ansible/roles/mastodon/files/purge-media.sh
+++ b/ansible/roles/mastodon/files/purge-media.sh
@ -6,9 +6,9 @@ set -ex

 cd /opt/mastodon

-docker-compose exec mastodon tootctl accounts prune
-docker-compose exec mastodon tootctl media remove
-docker-compose exec mastodon tootctl media remove --prune-profiles
-docker-compose exec mastodon tootctl preview_cards remove --days=21
-docker-compose exec mastodon tootctl media remove-orphans
-docker-compose exec mastodon tootctl statuses remove --days=180
+docker compose exec mastodon tootctl accounts prune
+docker compose exec mastodon tootctl media remove
+docker compose exec mastodon tootctl media remove --prune-profiles
+docker compose exec mastodon tootctl preview_cards remove --days=21
+docker compose exec mastodon tootctl media remove-orphans
+docker compose exec mastodon tootctl statuses remove --days=180
--- a/ansible/roles/mastodon/tasks/main.yml
+++ b/ansible/roles/mastodon/tasks/main.yml
@ -14,7 +14,7 @@
    dest: /opt/mastodon/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart mastodon

 - name: Install media cleanup script
--- a/ansible/roles/ntfy/tasks/main.yml
+++ b/ansible/roles/ntfy/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/ntfy/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart ntfy
--- a/ansible/roles/plausible/tasks/main.yml
+++ b/ansible/roles/plausible/tasks/main.yml
@ -28,5 +28,5 @@
    dest: /opt/plausible/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart plausible
--- a/ansible/roles/pocket_id/tasks/main.yml
+++ b/ansible/roles/pocket_id/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/pocket-id/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart pocket-id
--- a/ansible/roles/privatebin/tasks/main.yml
+++ b/ansible/roles/privatebin/tasks/main.yml
@ -11,7 +11,7 @@
    dest: /opt/privatebin/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart privatebin

 - name: Install config file
--- a/ansible/roles/prometheus/handlers/main.yml
+++ b/ansible/roles/prometheus/handlers/main.yml
@ -11,4 +11,4 @@
 - name: reload prometheus
  shell:
    chdir: /opt/prometheus
-    cmd: docker-compose exec prometheus kill -HUP 1
+    cmd: docker compose exec prometheus kill -HUP 1
--- a/ansible/roles/prometheus/tasks/grafana.yml
+++ b/ansible/roles/prometheus/tasks/grafana.yml
@ -15,5 +15,5 @@
    dest: /opt/grafana/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart grafana
--- a/ansible/roles/prometheus/tasks/prometheus.yml
+++ b/ansible/roles/prometheus/tasks/prometheus.yml
@ -19,7 +19,7 @@
    dest: /opt/prometheus/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart prometheus

 - name: Install blackbox config
--- a/ansible/roles/pve_docker/files/nextcloud/occ
+++ b/ansible/roles/pve_docker/files/nextcloud/occ
@ -2,4 +2,4 @@

 set -e

-exec docker-compose -f /opt/nextcloud/docker-compose.yml exec nextcloud occ "$@"
+exec docker compose -f /opt/nextcloud/docker-compose.yml exec nextcloud occ "$@"
--- a/ansible/roles/pve_docker/tasks/calibre.yml
+++ b/ansible/roles/pve_docker/tasks/calibre.yml
@ -11,7 +11,7 @@
    dest: /opt/calibre/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  register: compose_file

 - name: restart calibre
--- a/ansible/roles/pve_docker/tasks/librespeed.yml
+++ b/ansible/roles/pve_docker/tasks/librespeed.yml
@ -14,7 +14,7 @@
    dest: /opt/librespeed/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  register: compose_file

 - name: restart librespeed
--- a/ansible/roles/pve_docker/tasks/nextcloud.yml
+++ b/ansible/roles/pve_docker/tasks/nextcloud.yml
@ -14,7 +14,7 @@
    dest: /opt/nextcloud/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  register: compose_file

 - name: Install nextcloud config
--- a/ansible/roles/pve_docker/tasks/synapse.yml
+++ b/ansible/roles/pve_docker/tasks/synapse.yml
@ -14,7 +14,7 @@
    dest: /opt/synapse/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  register: compose_file

 - name: Install synapse config
--- a/ansible/roles/pve_docker/tasks/whoami.yml
+++ b/ansible/roles/pve_docker/tasks/whoami.yml
@ -11,7 +11,7 @@
    dest: /opt/whoami/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  register: compose_file

 - name: restart whoami
--- a/ansible/roles/renovate/tasks/main.yml
+++ b/ansible/roles/renovate/tasks/main.yml
@ -14,7 +14,7 @@
    dest: /opt/renovate/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart renovate

 - name: Install config file
--- a/ansible/roles/slides/tasks/main.yml
+++ b/ansible/roles/slides/tasks/main.yml
@ -14,7 +14,7 @@
    dest: /opt/slides/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart slides

 - name: Create credentials
--- a/ansible/roles/tandoor/tasks/main.yml
+++ b/ansible/roles/tandoor/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/tandoor/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart tandoor
--- a/ansible/roles/traefik/tasks/main.yml
+++ b/ansible/roles/traefik/tasks/main.yml
@ -33,7 +33,7 @@
    dest: /opt/traefik/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart traefik

 - name: Install config
--- a/ansible/roles/uptime_kuma/tasks/main.yml
+++ b/ansible/roles/uptime_kuma/tasks/main.yml
@ -11,5 +11,5 @@
    dest: /opt/uptime-kuma/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart uptime-kuma
--- a/ansible/roles/vaultwarden/tasks/main.yml
+++ b/ansible/roles/vaultwarden/tasks/main.yml
@ -11,5 +11,5 @@
    dest: /opt/vaultwarden/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart vaultwarden
--- a/ansible/roles/vikunja/tasks/main.yml
+++ b/ansible/roles/vikunja/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/vikunja/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart vikunja
--- a/ansible/roles/website/tasks/main.yml
+++ b/ansible/roles/website/tasks/main.yml
@ -14,5 +14,5 @@
    dest: /opt/website/docker-compose.yml
    mode: "{{ docker_compose_file_mask }}"
    owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
  notify: restart website