From adec36d06aabb066104a2aa0fc7f11fab09f78de Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Tue, 9 Apr 2024 13:21:30 +0200
Subject: [PATCH] Update to 24.0.2

---
 cloudbeaver.nomad.hcl                             |  9 ++++-----
 example/cloudbeaver.nomad.hcl                     | 15 +++++++++++----
 example/images/cloudbeaver/Dockerfile             |  4 ++--
 .../cloudbeaver/root/usr/local/bin/cloudbeaver    |  2 +-
 images/cloudbeaver/root/usr/local/bin/cloudbeaver |  2 +-
 variables.yml                                     |  4 ++--
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cloudbeaver.nomad.hcl b/cloudbeaver.nomad.hcl
index a08d389..1237ca9 100644
--- a/cloudbeaver.nomad.hcl
+++ b/cloudbeaver.nomad.hcl
@@ -1,15 +1,14 @@
 job "[[ .instance ]]" {
 
-[[- $c := merge .cloudbeaver . ]]
-[[ template "common/job_start" $c ]]
+[[ template "common/job_start" . ]]
 
   group "cloudbeaver" {
-    shutdown_delay = "6s"
-[[ template "common/constraints" $c ]]
+[[- $c := merge .cloudbeaver . ]]
+[[ template "common/group_start" $c ]]
 
     network {
       mode = "bridge"
-[[- if $c.prometheus.enabled ]]
+[[- if conv.ToBool $c.prometheus.enabled ]]
       port "metrics" {}
 [[- end ]]
     }
diff --git a/example/cloudbeaver.nomad.hcl b/example/cloudbeaver.nomad.hcl
index ce805c5..462424c 100644
--- a/example/cloudbeaver.nomad.hcl
+++ b/example/cloudbeaver.nomad.hcl
@@ -1,21 +1,28 @@
 job "cloudbeaver" {
 
+
   datacenters = ["dc1"]
   region      = "global"
 
 
-
-
   group "cloudbeaver" {
+
     shutdown_delay = "6s"
 
 
 
+    ephemeral_disk {
+      # Use minimal ephemeral disk
+      size = 101
+    }
+
+
     network {
       mode = "bridge"
     }
 
 
+
     volume "data" {
       source          = "cloudbeaver-data"
       type            = "csi"
@@ -88,7 +95,7 @@ job "cloudbeaver" {
       user   = 1053
 
       config {
-        image           = "danielberteaud/wait-for:24.3-1"
+        image           = "danielberteaud/wait-for:24.4-1"
         readonly_rootfs = true
         pids_limit      = 20
       }
@@ -116,7 +123,7 @@ job "cloudbeaver" {
       driver = "docker"
 
       config {
-        image           = "danielberteaud/cloudbeaver:24.0.1-1"
+        image           = "danielberteaud/cloudbeaver:24.0.2-2"
         pids_limit      = 100
         readonly_rootfs = true
         mount {
diff --git a/example/images/cloudbeaver/Dockerfile b/example/images/cloudbeaver/Dockerfile
index 95db1c7..30e0f8e 100644
--- a/example/images/cloudbeaver/Dockerfile
+++ b/example/images/cloudbeaver/Dockerfile
@@ -1,4 +1,4 @@
-FROM danielberteaud/java:17.24.3-5
+FROM danielberteaud/java:17.24.4-1
 MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
 
 ENV CLOUDBEAVER_WEB_CONFIG=/opt/cloudbeaver/conf/cloudbeaver.conf
@@ -13,7 +13,7 @@ RUN set -euxo pipefail &&\
     mkdir -p /data/workspace /data/.eclipse &&\
     chown -R cloudbeaver:cloudbeaver /data
 
-COPY --from=dbeaver/cloudbeaver:24.0.1 /opt/cloudbeaver /opt/cloudbeaver
+COPY --from=dbeaver/cloudbeaver:24.0.2 /opt/cloudbeaver /opt/cloudbeaver
 COPY root/ /
 
 RUN set -euxo pipefail &&\
diff --git a/example/images/cloudbeaver/root/usr/local/bin/cloudbeaver b/example/images/cloudbeaver/root/usr/local/bin/cloudbeaver
index 6404e4b..d2b7265 100755
--- a/example/images/cloudbeaver/root/usr/local/bin/cloudbeaver
+++ b/example/images/cloudbeaver/root/usr/local/bin/cloudbeaver
@@ -32,7 +32,7 @@ java ${JAVA_OPTS} \
   --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
   --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
   --add-opens=java.sql/java.sql=ALL-UNNAMED \
-  -jar server/plugins/org.eclipse.equinox.launcher*.jar \
+  -jar server/plugins/org.jkiss.dbeaver.launcher*.jar \
   -product io.cloudbeaver.product.ce.product \
   -web-config ${CLOUDBEAVER_WEB_CONFIG} \
   -data /data/.metadata \
diff --git a/images/cloudbeaver/root/usr/local/bin/cloudbeaver b/images/cloudbeaver/root/usr/local/bin/cloudbeaver
index 6404e4b..d2b7265 100755
--- a/images/cloudbeaver/root/usr/local/bin/cloudbeaver
+++ b/images/cloudbeaver/root/usr/local/bin/cloudbeaver
@@ -32,7 +32,7 @@ java ${JAVA_OPTS} \
   --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
   --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED \
   --add-opens=java.sql/java.sql=ALL-UNNAMED \
-  -jar server/plugins/org.eclipse.equinox.launcher*.jar \
+  -jar server/plugins/org.jkiss.dbeaver.launcher*.jar \
   -product io.cloudbeaver.product.ce.product \
   -web-config ${CLOUDBEAVER_WEB_CONFIG} \
   -data /data/.metadata \
diff --git a/variables.yml b/variables.yml
index 409df7e..91942af 100644
--- a/variables.yml
+++ b/variables.yml
@@ -7,10 +7,10 @@ instance: cloudbeaver
 cloudbeaver:
 
   # Version of cloudbeaver to deploy
-  version: 24.0.1
+  version: 24.0.2
 
   # Docker image to use
-  image: '[[ .docker.repo ]]cloudbeaver:[[ .cloudbeaver.version ]]-1'
+  image: '[[ .docker.repo ]]cloudbeaver:[[ .cloudbeaver.version ]]-2'
 
   # Resources for the container
   resources: