From e43cdb811b9dac1ae8f9f83fe6b7b9a62dd08c03 Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 14:03:27 +0200 Subject: [PATCH 1/6] Upgrade to 2025.6 --- env.test.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env.test.template b/env.test.template index de1120c..23c2942 100644 --- a/env.test.template +++ b/env.test.template @@ -4,9 +4,9 @@ PUBLIC_DOMAIN=sso.test.base23.de COMPOSE_PROJECT_NAME=sso-base23-de # Server Versions -AUTHENTIK_TAG=2025.4.2 -POSTGRES_TAG=16.6-alpine -REDIS_TAG=7.4.2-alpine +AUTHENTIK_TAG=2025.6.3 +POSTGRES_TAG=16.9-alpine +REDIS_TAG=8.0-alpine RESTICKER_TAG=0.0.2-restic0.17.0 # Error reporting & Logging From c4714b03e647d6aae97bafc2527229b6bcf432a2 Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 14:04:46 +0200 Subject: [PATCH 2/6] Upgrade to 2025.6 --- env.prod.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env.prod.template b/env.prod.template index a0ae3f8..418b2e3 100644 --- a/env.prod.template +++ b/env.prod.template @@ -4,9 +4,9 @@ PUBLIC_DOMAIN=sso.base23.de COMPOSE_PROJECT_NAME=sso-base23-de # Server Versions -AUTHENTIK_TAG=2025.4.2 -POSTGRES_TAG=16.6-alpine -REDIS_TAG=7.4.2-alpine +AUTHENTIK_TAG=2025.6.3 +POSTGRES_TAG=16.9-alpine +REDIS_TAG=8.0-alpine RESTICKER_TAG=0.0.2-restic0.17.0 NGINX_UNPRIVILEGED_TAG=1.27.2-bookworm From e636c4d7e56ac7b217495d2767433aee5e6ea8b3 Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 15:30:00 +0200 Subject: [PATCH 3/6] Updated upgrade documentation --- README.md | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ebc6b4d..9257a69 100644 --- a/README.md +++ b/README.md @@ -210,29 +210,36 @@ docker compose build --no-cache \ ## Upgrade + + ### Test +This is intended for testing the upgrades before rollout on prod. 1. Check if the backups are up to date: `docker compose run --rm restore-cli /usr/local/bin/restic snapshots` 2. Update `AUTHENTIK_TAG` to the desired tag in `env.test.template`. -3. Commit & push changes to the Repo. +3. Check the upstream `docker-compose.yml` file against ours for changes made in the configuration. Check the Postgresql and Redis docker tags. Minor revisions of Postgresql *should be fine*, check the changelogs for any issues and if none are present raise to the latest Minor version (e.g. 16.6 -> 16.9). Redis should be less problematic for upgrades, check nonetheless. 4. Run `diff --color='auto' env.test.template .env` to display the diff between `env.test.template` and `.env`. -5. Port the made changes to `.env`. +5. Port the changes made to `.env`. 6. `docker-compose-2.32.4 pull` 7. `docker-compose-2.32.4 down` 8. `docker-compose-2.32.4 up -d; docker-compose-2.32.4 logs -f` +9. Check the logs for any issues during during startup. Check if https://sso.test.base23.de is available and test the sso login (e.g https://vpn-test.base23.de/admin) +10. Apply changes for test to prod files (`docker-compose..yml`, `env..template`), commit & push changes to the Repo in a new branch and create a merge request in preparation for the prod upgrade ### Prod +It is expected that the Upgrade has already been performed and tested on https://sso.test.base23.de, and the changes have been merged into main +0. Perform the Upgrade on test first. 1. Check if the backups are up to date: `docker compose run --rm restore-cli /usr/local/bin/restic snapshots` -2. Update `AUTHENTIK_TAG` to the desired tag in `env.prod.template`. -3. Commit & push changes to the Repo. -4. Run `diff --color='auto' env.prod.template .env` to display the diff between -`env.prod.template` and `.env`. -5. Port the made changes to `.env`. -6. `docker compose pull` -7. `docker compose down` -8. `docker compose up -d; docker compose logs -f` +2. Perform a git pull +4. Run `diff --color='auto' env.prod.template .env` to display the diff between `env.prod.template` and `.env`. +5. Run `diff --color='auto' docker-compose.prod.yml docker-compose.yml` to display the diff between `docker-compose.prod.yml`and docker-compose.yml` +6. Port the changes made to `.env` and `docker-compose.yml` +7. `docker compose pull` +8. `docker compose down` +9. `docker compose up -d; docker compose logs -f` +10. Check the logs for any issues during during startup. Check if https://sso.base23.de is available and test the sso login (e.g https://vpn.base23.de/admin). ## Disaster recovery / restore From 3ad1c0c6703a453052d907a69b09f734bf3b7bcc Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 15:30:50 +0200 Subject: [PATCH 4/6] Edit README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 9257a69..9b01932 100644 --- a/README.md +++ b/README.md @@ -210,8 +210,6 @@ docker compose build --no-cache \ ## Upgrade - - ### Test This is intended for testing the upgrades before rollout on prod. From 61e5fe027011e5436b6575c68045dd55459640dc Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 15:41:36 +0200 Subject: [PATCH 5/6] changed login example --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b01932..bcfadf1 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ This is intended for testing the upgrades before rollout on prod. 6. `docker-compose-2.32.4 pull` 7. `docker-compose-2.32.4 down` 8. `docker-compose-2.32.4 up -d; docker-compose-2.32.4 logs -f` -9. Check the logs for any issues during during startup. Check if https://sso.test.base23.de is available and test the sso login (e.g https://vpn-test.base23.de/admin) +9. Check the logs for any issues during during startup. Check if https://sso.test.base23.de is available and test the sso login (e.g https://whoami.test.base23.de) 10. Apply changes for test to prod files (`docker-compose..yml`, `env..template`), commit & push changes to the Repo in a new branch and create a merge request in preparation for the prod upgrade ### Prod From 317564c27e16e202a07805ed78c6b29bd9448a66 Mon Sep 17 00:00:00 2001 From: Simon Stumpe Date: Tue, 22 Jul 2025 15:49:57 +0200 Subject: [PATCH 6/6] Patch 2025.6.4 --- env.prod.template | 2 +- env.test.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/env.prod.template b/env.prod.template index 418b2e3..5925d27 100644 --- a/env.prod.template +++ b/env.prod.template @@ -4,7 +4,7 @@ PUBLIC_DOMAIN=sso.base23.de COMPOSE_PROJECT_NAME=sso-base23-de # Server Versions -AUTHENTIK_TAG=2025.6.3 +AUTHENTIK_TAG=2025.6.4 POSTGRES_TAG=16.9-alpine REDIS_TAG=8.0-alpine RESTICKER_TAG=0.0.2-restic0.17.0 diff --git a/env.test.template b/env.test.template index 23c2942..b07f13c 100644 --- a/env.test.template +++ b/env.test.template @@ -4,7 +4,7 @@ PUBLIC_DOMAIN=sso.test.base23.de COMPOSE_PROJECT_NAME=sso-base23-de # Server Versions -AUTHENTIK_TAG=2025.6.3 +AUTHENTIK_TAG=2025.6.4 POSTGRES_TAG=16.9-alpine REDIS_TAG=8.0-alpine RESTICKER_TAG=0.0.2-restic0.17.0