From 0aeebb5d9899df473890d389231808830a27e0a6 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Tue, 2 Jul 2024 18:33:41 +0200
Subject: [PATCH] Bump hackmd version, migrate to docker compose v2 ansible
 module

---
 ansible/playbooks/misc-docker.yaml     | 17 ++++++++---------
 docker/docker/caddy/Caddyfile          |  4 ----
 docker/docker/codi/docker-compose.yaml |  2 +-
 docker/docker/score/README.md          |  3 +++
 4 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 docker/docker/score/README.md

diff --git a/ansible/playbooks/misc-docker.yaml b/ansible/playbooks/misc-docker.yaml
index 1433625..a37aa47 100644
--- a/ansible/playbooks/misc-docker.yaml
+++ b/ansible/playbooks/misc-docker.yaml
@@ -109,11 +109,11 @@
     # that Gitea is reachable before those configurations are deployed.
     - name: Set up caddy and gitea containers
       become: true
-      community.docker.docker_compose:
+      community.docker.docker_compose_v2:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: true
-        debug: true
+        build: "always"
+        pull: "always"
       loop:
         - name: caddy
           state: present
@@ -132,12 +132,11 @@
       delay: 5  # Retry every 5 seconds
     - name: Set up other containers
       become: true
-      community.docker.docker_compose:
+      community.docker.docker_compose_v2:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: true
-        pull: true
-        debug: true
+        build: "always"
+        pull: "always"
       loop:
         - name: drone
           state: present
@@ -147,11 +146,11 @@
           state: present
         - name: utoy
           state: present
-        - name: score
-          state: present
 
         # Keep these to ensure they're down
         - name: factorio
           state: absent
         - name: glebby
           state: absent
+        - name: score
+          state: absent
diff --git a/docker/docker/caddy/Caddyfile b/docker/docker/caddy/Caddyfile
index bd47907..8002273 100644
--- a/docker/docker/caddy/Caddyfile
+++ b/docker/docker/caddy/Caddyfile
@@ -44,7 +44,3 @@ plantuml.pbrinkmeier.de {
 utoy.beany.club {
     reverse_proxy utoy:3000
 }
-
-score.brocke.net {
-    reverse_proxy score:8080
-}
diff --git a/docker/docker/codi/docker-compose.yaml b/docker/docker/codi/docker-compose.yaml
index b7805f0..265a152 100644
--- a/docker/docker/codi/docker-compose.yaml
+++ b/docker/docker/codi/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   codi:
-    image: hackmdio/hackmd:2.4.2
+    image: hackmdio/hackmd:2.5.4
     user: hackmd
     environment:
       # Admin stuff
diff --git a/docker/docker/score/README.md b/docker/docker/score/README.md
new file mode 100644
index 0000000..90521fa
--- /dev/null
+++ b/docker/docker/score/README.md
@@ -0,0 +1,3 @@
+# score
+
+Seems to not be maintained anymore.