.gitea/workflows/check.yaml

@@ -10,6 +10,6 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@v3
       - run: python3 -m venv venv
-      - run: venv/bin/pip --disable-pip-version-check install ansible==9.6.0 ansible-lint==24.2.2 > /dev/null 2> /dev/null
+      - run: venv/bin/pip --disable-pip-version-check install ansible==7.2.0 ansible-lint==6.16.1 > /dev/null 2> /dev/null
       - run: venv/bin/ansible-lint -c .ansible-lint ansible
   # TODO: Reimplement ansible-play --check step from old drone config

README.md

@@ -17,7 +17,3 @@ ansible-lint --offline
 ```
 
 to avoid checking for a new version every single run.
-
-## TODO
-
-- [ ] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated)

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_v2:
+      community.docker.docker_compose:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: "always"
+        build: true
-        pull: "always"
+        debug: true
       loop:
         - name: caddy
           state: present
@@ -132,11 +132,11 @@
       delay: 5  # Retry every 5 seconds
     - name: Set up other containers
       become: true
-      community.docker.docker_compose_v2:
+      community.docker.docker_compose:
         project_src: "/etc/pbri/docker/{{ item.name }}"
         state: "{{ item.state }}"
-        build: "always"
+        build: true
-        pull: "always"
+        debug: true
       loop:
         - name: drone
           state: present
@@ -146,11 +146,10 @@
           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

docker/docker/caddy/Caddyfile

@@ -44,3 +44,7 @@ plantuml.pbrinkmeier.de {
 utoy.beany.club {
     reverse_proxy utoy:3000
 }
+
+score.brocke.net {
+    reverse_proxy score:8080
+}

docker/docker/caddy/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   # Webserver for static files and reverse proxy
   web:

docker/docker/codi/docker-compose.yaml

@@ -1,6 +1,8 @@
+version: "3"
+
 services:
   codi:
-    image: hackmdio/hackmd:2.5.4
+    image: hackmdio/hackmd:2.4.2
     user: hackmd
     environment:
       # Admin stuff

docker/docker/drone/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   drone:
     image: drone/drone:2

docker/docker/factorio/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   gitea:
     image: pbrinkmeier/factorio

docker/docker/gitea/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   gitea:
     image: gitea/gitea:1.20.3

docker/docker/glebby/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   glebby:
     image: git.pbrinkmeier.de/paul/glebby:1.1-prod

docker/docker/jupyter/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   jupyter:
     image: git.pbrinkmeier.de/paul/jup:1.5

docker/docker/score/README.md

@@ -1,3 +0,0 @@
-# score
-
-Seems to not be maintained anymore.

docker/docker/score/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   score:
     image: ghcr.io/lbrocke/score:v1.0.2

docker/docker/utoy/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
   utoy:
     image: git.pbrinkmeier.de/paul/utoy:0.6

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1685518550,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719936093,
+        "lastModified": 1686259070,
-        "narHash": "sha256-oe5wiTSfxeDLisswomHcMGMV01hkBGuCJyMzjqCDdPY=",
+        "narHash": "sha256-bJ2TqJHMdU27o3+AlYzsDooUzneFHwvK5LaRv5JYit4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f593f9129f3cbf39261a8bbc86f6b4ceb4624881",
+        "rev": "8a7d5c039cacc83bd1926aaabc04d541e04a1460",
         "type": "github"
       },
       "original": {