From 3df66b1be74917bbeb90fdd9aa89edde4f53316d Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Tue, 25 Jul 2023 11:41:33 +0200
Subject: [PATCH] chore: publish 3.2.0+2023.6.1 release

---
 abra.sh                       |  2 +-
 compose.yml                   | 12 ++++++------
 flow_authentication.yaml.tmpl |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/abra.sh b/abra.sh
index f8ec307..9b40219 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,5 +1,5 @@
 export CUSTOM_CSS_VERSION=v2
-export FLOW_AUTHENTICATION_VERSION=v1
+export FLOW_AUTHENTICATION_VERSION=v2
 export FLOW_INVITATION_VERSION=v1
 export FLOW_INVALIDATION_VERSION=v1
 export FLOW_RECOVERY_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 83e0c4d..11c1100 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ x-env: &env
 version: '3.8'
 services:
   app:
-    image: ghcr.io/goauthentik/server:2023.3.1
+    image: ghcr.io/goauthentik/server:2023.6.1
     command: server
     secrets:
       - db_password
@@ -50,7 +50,7 @@ services:
       - internal
       - proxy
     healthcheck:
-      test: ["CMD", "curl", "-f", "localhost:9000/-/health/live/"]
+      test: "bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/9000; exit $$?;'"
       interval: 30s
       timeout: 10s
       retries: 10
@@ -72,11 +72,11 @@ services:
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.customFrameOptionsValue=SAMEORIGIN"
         - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}"
-        - "coop-cloud.${STACK_NAME}.version=3.1.2+2023.3.1"
+        - "coop-cloud.${STACK_NAME}.version=3.2.0+2023.6.1"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
   worker:
-    image: ghcr.io/goauthentik/server:2023.3.1
+    image: ghcr.io/goauthentik/server:2023.6.1
     command: worker
     secrets:
       - db_password
@@ -107,7 +107,7 @@ services:
     environment: *env
 
   db:
-    image: postgres:12.14-alpine
+    image: postgres:12.15-alpine
     secrets:
       - db_password
     volumes:
@@ -132,7 +132,7 @@ services:
           backupbot.backup.path: "/var/lib/postgresql/data"
 
   redis:
-    image:  redis:7.0.10-alpine
+    image:  redis:7.0.12-alpine
     networks:
       - internal
     healthcheck:
diff --git a/flow_authentication.yaml.tmpl b/flow_authentication.yaml.tmpl
index 979a25c..8eefce4 100644
--- a/flow_authentication.yaml.tmpl
+++ b/flow_authentication.yaml.tmpl
@@ -22,7 +22,9 @@ entries:
   attrs:
     name: !Context welcome_message
     title: !Context welcome_message
-
+    user_fields:
+    - email
+    - username
 ### STAGES
 - identifiers:
     name: default-authentication-identification
@@ -30,6 +32,9 @@ entries:
   attrs:
     password_stage: !Find [authentik_stages_password.passwordstage, [name, default-authentication-password]]
     recovery_flow: !Find [authentik_flows.flow, [slug, default-recovery-flow]]
+    user_fields:
+    - email
+    - username
 
 - identifiers:
     name: default-authentication-login