chore: publish 1.4.0+apache-2.34.0 release

.drone.yml

@@ -18,7 +18,7 @@ steps:
       STACK_NAME: kimai
       LETS_ENCRYPT_ENV: production
       ENTRYPOINT_CONF_VERSION: v2
-      LOCAL_CONF_VERSION: v1
+      LOCAL_CONF_VERSION: v2
       SECRET_DB_PASSWORD_VERSION: v1
       SECRET_DB_ROOT_PASSWORD_VERSION: v1
       SECRET_ADMIN_PASSWORD_VERSION: v1
@@ -38,7 +38,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag

README.md

@@ -23,7 +23,7 @@ Based on the recommended [`tobybatch/kimai2`] compose file.
 4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
 5. `abra app deploy YOURAPPDOMAIN`
-6. `abra app run YOURAPPDOMAIN app create_admin`
+6. Retrieve the admin password and username with this command `abra app run <DOMAIN> cat /run/secrets/admin_password`
 
 [Kimai]: https://www.kimai.org/
 [`tobybatch/kimai2`]: https://tobybatch.github.io/kimai2/docker-compose.html#docker-compose

abra.sh

@@ -1,5 +1,5 @@
 export ENTRYPOINT_CONF_VERSION=v2
-export LOCAL_CONF_VERSION=v2
+export LOCAL_CONF_VERSION=v3
 
 create_admin () {
     export DATABASE_URL="$DATABASE_TYPE://$DATABASE_USER:$(cat /run/secrets/db_password)@$DATABASE_HOST/$DATABASE_NAME"

compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   app:
-    image: kimai/kimai2:apache-2.26.0
+    image: kimai/kimai2:apache-2.34.0
     environment:
       - APP_ENV=prod
       - TRUSTED_HOSTS=localhost,traefik,${DOMAIN},127.0.0.1
@@ -58,7 +58,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=1.3.0+apache-2.26.0"
+        - "coop-cloud.${STACK_NAME}.version=1.4.0+apache-2.34.0"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
   db:
     image: mysql:5.7

local.yaml.tmpl

@@ -11,8 +11,8 @@ kimai:
       attribute: http://schemas.xmlsoap.org/claims/Group
       mapping:
       # Insert your roles here (ROLE_USER is added automatically)
-        - { saml: admin.group, kimai: ROLE_ADMIN }
-        - { saml: "authentik Admins", kimai: ROLE_ADMIN }
+        - { saml: admin.group, kimai: ROLE_SUPER_ADMIN }
+        - { saml: "authentik Admins", kimai: ROLE_SUPER_ADMIN }
     connection:
       # You SAML provider
       # Your Authentik instance, replace https://authentik.company with your authentik URL