Upgrade DO appliance to 2025.2 (#81)

* Minimal changes to upgrade to 2024.12.3

* Fix container name

* Use new 99-img-check.sh from DO

* Use docker compose v2 instead of docker-compose

* Remove droplet-agent from the image

* Update to 2025.2.0-rc1

* Update .github/workflows/build-do.yml

* run on PR

* update deps

* fix

---------

Co-authored-by: Jens L. <jens@beryju.org>
Co-authored-by: Jens Langhammer <jens.langhammer@beryju.org>

Author: melizeche

.github/workflows/build-do.yml

@@ -2,6 +2,9 @@
 name: Build (DigitalOcean)
 
 on:
+  pull_request:
+    branches:
+      - main
   push:
     branches:
       - main
@@ -15,7 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version-file: "pyproject.toml"
       - name: Install ansible
         env:
           DO_API_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}
@@ -34,5 +37,5 @@ jobs:
       - run: packer validate -syntax-only .
       - run: packer build -color=false -force .
         env:
-          AUTHENTIK_VERSION: 2022.12.1
+          AUTHENTIK_VERSION: 2025.2.0
           DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }}

digitalocean.pkr.hcl

@@ -4,6 +4,10 @@ packer {
       version = ">= 1.0.0"
       source  = "github.com/hashicorp/digitalocean"
     }
+    ansible = {
+      version = "~> 1"
+      source = "github.com/hashicorp/ansible"
+    }
   }
 }
 

poetry.lock

@@ -2,13 +2,13 @@
 name = "authentik-appliances"
 version = "0.1.0"
 description = ""
-authors = ["Jens Langhammer <jens.langhammer@beryju.org>"]
+package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.12"
 ansible = "^9.2.0"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 ansible-lint = "^6.8.7"
 
 [build-system]

pyproject.toml

@@ -1,6 +1,6 @@
 ---
 roles:
   - name: geerlingguy.pip
-    version: 2.1.0
+    version: 3.1.0
   - name: geerlingguy.docker
-    version: 4.1.1
+    version: 7.4.5

requirements.yml

@@ -10,7 +10,7 @@ function prefixwith {
 }
 
 function in_continer() {
-    docker exec -it authentik_server_1 ak $@
+    docker exec -it authentik-server-1 ak $@
 }
 
 function appliance() {

roles/goauthentik.appliance/files/scripts/ak

@@ -28,11 +28,11 @@
     content: |
       PG_PASS=foo
 - name: authentik | Compose pre-pull
-  docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /srv/authentik
-    pull: yes
+    pull: always
 - name: authentik | Compose stop
-  docker_compose:
+  community.docker.docker_compose_v2:
     project_src: /srv/authentik
     state: absent
     remove_volumes: yes

roles/goauthentik.appliance/tasks/app.yaml

@@ -3,8 +3,17 @@
   vars:
     pip_install_packages:
       - name: docker
-      - name: docker-compose
+    docker_edition: 'ce'
+    docker_packages:
+      - "docker-{{ docker_edition }}"
+      - "docker-{{ docker_edition }}-cli"
+      #- "docker-{{ docker_edition }}-rootless-extras"
+    docker_packages_state: present
+    docker_install_compose_plugin: true
+    docker_compose_package: docker-compose-plugin
+    docker_compose_package_state: present
     docker_install_compose: true
+    docker_compose_path: /usr/local/bin/docker-compose
     docker_daemon_options:
       live-restore: true
       log-opts:

site.yaml

@@ -21,6 +21,7 @@ elif [ -n "$(command -v apt-get)" ]; then
   export DEBIAN_FRONTEND=noninteractive
   apt-get -y update
   apt-get -o Dpkg::Options::="--force-confold" upgrade -q -y --force-yes
+  apt-get purge droplet-agent* -y
   apt-get -y autoremove
   apt-get -y autoclean
 fi