Bump pbrinkmeier.de

.gitea/workflows/check.yaml

@@ -2,14 +2,15 @@ name: Check
 on: [push]
 jobs:
   "Lint Ansible Files":
-    runs-on: ubuntu-22.04
+    runs-on: node-22-bookworm
     steps:
       - run: apt-get update
+      - run: apt-get upgrade -y
       - run: apt-get install -y python3 python3-pip python3-venv
       - run: python3 --version
       - name: Check out repo
         uses: actions/checkout@v3
       - run: python3 -m venv venv
-      - 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/pip --disable-pip-version-check install ansible==9.6.0 ansible-lint==24.2.2
       - run: venv/bin/ansible-lint -c .ansible-lint ansible
   # TODO: Reimplement ansible-play --check step from old drone config

README.md

@@ -17,3 +17,7 @@ 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

@@ -17,9 +17,6 @@
         - name: gitea
           uid: 42001
           state: present
-        - name: score
-          uid: 42003
-          state: present
         - name: factorio
           uid: 845
           state: present
@@ -33,6 +30,9 @@
         - name: bsa
           uid: 42002
           state: absent
+        - name: score
+          uid: 42003
+          state: absent
     # All services that are behind Caddy need to be in this network
     - name: Create Caddy network
       become: true
@@ -68,6 +68,8 @@
           state: present
         - name: gitea
           state: present
+        - name: vrnp
+          state: present
     - name: Create directory for docker volumes
       become: true
       ansible.builtin.file:
@@ -96,11 +98,11 @@
         owner: factorio
         group: factorio
         mode: u=rwx,g=,o=
-    - name: Create score data folder
+    - name: Delete score data folder
       become: true
       ansible.builtin.file:
         path: /var/lib/pbri/docker/score
-        state: directory
+        state: absent
         owner: score
         group: score
         mode: u=rwx,g=,o=
@@ -109,11 +111,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,11 +134,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
-        debug: true
+        build: "always"
+        pull: "always"
       loop:
         - name: drone
           state: present
@@ -146,10 +148,13 @@
           state: present
         - name: utoy
           state: present
-        - name: score
+        - name: vrnp
           state: present
 
+        # Keep these to ensure they're down
         - name: factorio
           state: absent
         - name: glebby
           state: absent
+        - name: score
+          state: absent

ansible/playbooks/misc-sites.yaml

@@ -6,11 +6,11 @@
       ansible.builtin.include_role:
         name: checkout_static_sites
       vars:
-        checkout_static_sites:
+        checkout_static_sites_config:
           checkouts:
             - path: /home/paul/Sites/pbrinkmeier.de
               url: https://git.pbrinkmeier.de/paul/pbrinkmeier.de
-              commit: 680ac7d9c44752f57436d0ecb9c8018205a5fc0f
+              commit: bab3208e61972851a5e609930a05e0d4322f8a06
               owner: paul
             - path: /home/paul/Sites/tichy.click
               url: https://github.com/pbrinkmeier/tichy-clicker

ansible/roles/checkout_static_sites/tasks/main.yaml

@@ -7,7 +7,7 @@
     mode: '0755'
     owner: "{{ item.owner }}"
     group: "{{ item.owner }}"
-  loop: "{{ checkout_static_sites.checkouts }}"
+  loop: "{{ checkout_static_sites_config.checkouts }}"
 - name: Check out static site repositories
   become: true
   become_user: "{{ item.owner }}"
@@ -15,4 +15,5 @@
     dest: "{{ item.path }}"
     repo: "{{ item.url }}"
     version: "{{ item.commit }}"
-  loop: "{{ checkout_static_sites.checkouts }}"
+    force: true
+  loop: "{{ checkout_static_sites_config.checkouts }}"

docker/docker/caddy/Caddyfile

@@ -45,6 +45,6 @@ utoy.beany.club {
     reverse_proxy utoy:3000
 }
 
-score.brocke.net {
-    reverse_proxy score:8080
+vrnp.beany.club {
+    reverse_proxy vrnp:8000
 }

docker/docker/caddy/docker-compose.yaml

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

docker/docker/codi/docker-compose.yaml

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

docker/docker/drone/docker-compose.yaml

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

docker/docker/factorio/docker-compose.yaml

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

docker/docker/gitea/Dockerfile

@@ -1,3 +1,3 @@
- FROM gitea/act_runner:0.2.5
+ FROM gitea/act_runner:0.2.10
 
  COPY runner-config.yaml /opt/runner-config.yaml

docker/docker/gitea/docker-compose.yaml

@@ -1,8 +1,6 @@
-version: "3"
-
 services:
   gitea:
-    image: gitea/gitea:1.20.3
+    image: gitea/gitea:1.21.11
     restart: unless-stopped
     environment:
       # Ref: https://docs.gitea.io/en-us/config-cheat-sheet
@@ -66,7 +64,7 @@ services:
       - /var/lib/pbri/docker/gitea_db:/var/lib/postgresql/data
 
   gitea_runner:
-    image: pbrinkmeier/act_runner:0.2.5
+    image: pbrinkmeier/act_runner:0.2.10
     build: .
     restart: unless-stopped
     environment:

docker/docker/gitea/runner-config.yaml

@@ -32,6 +32,8 @@ runner:
   # ubuntu:22.04 here is not enough.
   labels:
     - "ubuntu-22.04:docker://node:16-bullseye"
+    - "node-22-bullseye:docker://node:22-bullseye"
+    - "node-22-bookworm:docker://node:22-bookworm"
 
 cache:
   # Enable cache server to use actions/cache.

docker/docker/glebby/docker-compose.yaml

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

docker/docker/jupyter/docker-compose.yaml

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

docker/docker/score/README.md

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

docker/docker/score/docker-compose.yaml

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

docker/docker/utoy/docker-compose.yaml

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

docker/docker/vrnp/docker-compose.yaml

@@ -0,0 +1,11 @@
+services:
+  vrnp:
+    image: git.pbrinkmeier.de/paul/vrnp:0.0.3
+    restart: always
+    environment:
+      VRNP_PASSWORD: "${VRNP_PASSWORD}"
+
+networks:
+  default:
+    name: caddy-network
+    external: true

docker/envs/gitea/.env

@@ -1,14 +1,14 @@
 $ANSIBLE_VAULT;1.1;AES256
-35623364633833623964623536646534373634663736613561333561343136333965306638396532
-6162393239383936386338666565306132646230383066630a336337613636383431623738343663
-61343262363631376665383035323139313863626331666439336134613035663439376231343863
-3032353139643138640a383365356630323835383538393734643134343133653033383663333464
-62386361633435633664306531623835353665326432393932336163316561653866343137323030
-63643262323436356166373533363235366238393633336631336266373837373932313134303563
-65633337393938623134636538653561356565333831356638373862376333336163363438626438
-39343436383732313561396236656530303064363961663636353538346264633532633866333162
-35303032303662646166333537373566316462633536333463323433353539623363323036643763
-34376365613932303133366236613235636238643139666663356436326532616437383432303437
-39376535656266383465373837643634383937656431323265386163373138336164383666383962
-64623762613332363731323739666238613634646237396331666463363663313461313966356233
-30653362353061333739303234336461373337346632646433623462623765353330
+30626565616334613665623138613533653739333038643530636633393264393334373563326631
+3838333663306537326534333666316539383038363236650a613163643433653466666639666366
+33653861613638653862393338386334643332633762666136613932343834333162303363373030
+6161323863316134340a646532386537313164643039353435633535363061616363363337663365
+39343461356631383062353837383034653430373663323966373632323063636132613137643662
+37373065313764626539396463376637353136613365366566363436356537343932376565633962
+62316631663634316530623736613961623635303763633964386433333531626437303136363537
+35393134643935316330396161303134626537643162393062636363376435636162393136373034
+39636231626635643530313634333464653564353861656666633035623932336234303735386366
+62303133326237613763336435323338623036663137333439613462333434303734303737363936
+65333762376233396332633434353832373136383137336665623534356538636166303835376334
+64346139656432633230386666653531333864333664393936366630346334323963343431346164
+64376165666230386464303036303861653437646463633764343064376464396135

docker/envs/vrnp/.env

@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+36643163613366383136326339346231373533373361633834663332343932356665303434333564
+3936636366396233326664636137363134643066303432380a363662646465656130303431386530
+37316138366239313038336664313661333632393333666539363565623032653431623935613631
+3635323330363663610a353263663736653561666261636138336438666261613739346664393233
+32323364346665633662663266626436343831386565663761393237346637376438613865363663
+36613035376638653937633866613935343834633431393830303438363265656337343565323063
+36303033323537666236633037656236656133396431326362303462353237326162626335363761
+36636362306232333630613464393135383539666632343038393333353462336238663130326166
+3061

flake.lock

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