Update caretakerd, add wait_for task

images/lemonldap-ng/Dockerfile

@@ -2,7 +2,7 @@ FROM [[ .docker.repo ]][[ .docker.base_images.alma9.image ]]
 MAINTAINER [[ .docker.maintainer ]]
 
 ARG LLNG_VERSION=2.18.1 \
-    CARETAKERD_VERSION=1.0.7
+    CARETAKERD_VERSION=1.0.8
 
 ENV PATH=/usr/libexec/lemonldap-ng/bin:${PATH} \
     LLNG_LISTEN=unix:/tmp/llng.sock \

lemonldap-ng.nomad.hcl

@@ -52,6 +52,8 @@ job "[[ .instance ]]" {
       ]
     }
 
+[[ template "common/task.wait_for" $c ]]
+
     task "lemonldap-ng" {
       driver = [[ $c.nomad.driver | toJSON ]]
 
@@ -67,7 +69,9 @@ job "[[ .instance ]]" {
       }
 
       vault {
-        policies = ["[[ .instance ]][[ .consul.suffix ]]"]
+        policies     = ["[[ .instance ]][[ .consul.suffix ]]"]
+        env          = false
+        disable_file = true
       }
 
 [[ template "common/artifacts" $c ]]

templates/lemonldap-ng.ini.tpl

@@ -1,5 +1,5 @@
 [all]
-logLevel = notice
+logLevel = [[ .llng.engine.log_level ]]
 localSessionStorage = Cache::FileCache
 localSessionStorageOptions = {        \
   'namespace'          => 'sessions', \

variables.yml

@@ -12,7 +12,7 @@ llng:
     count: 1
 
     # Docker image to use
-    image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-4'
+    image: '[[ .docker.repo ]]lemonldap-ng:2.18.1-5'
 
     # Resource allocation
     resources:
@@ -26,6 +26,9 @@ llng:
           - destination_name: postgres[[ .consul.suffix ]]
             local_bind_port: 5432
 
+    wait_for:
+      - service: postgres[[ .consul.suffix ]]
+
     # Additional env vars to pass to the container
     env:
       # Database settings
@@ -46,6 +49,9 @@ llng:
         source: git::https://git.lapiole.org/nomad/lemonldap-ng.git//files/assets
         destination: local/assets/static/common
 
+    # Log level of the engine
+    log_level: notice
+
   # Settings for the portal itself
   portal:
     # URL used by users to reach the portal