Update to 25.0.0 and link workspace to /data

example/cloudbeaver.nomad.hcl

@@ -103,7 +103,7 @@ job "cloudbeaver" {
       user   = "1053:1053"
 
       config {
-        image           = "danielberteaud/wait-for:25.2-1"
+        image           = "danielberteaud/wait-for:25.3-1"
         readonly_rootfs = true
         pids_limit      = 20
       }
@@ -136,7 +136,7 @@ job "cloudbeaver" {
       }
 
       config {
-        image       = "danielberteaud/alpine:25.2-1"
+        image       = "danielberteaud/alpine:25.3-1"
         command     = "/local/chown.sh"
         userns_mode = "host"
       }
@@ -145,28 +145,27 @@ job "cloudbeaver" {
         data        = <<_EOT
 #!/bin/sh
 
+set -euo pipefail
+
 # Volume data must be owned by 8978:8978
 echo
-echo "Checking ownership of volume data"
-if [ "$(stat -c %u:%g /data)" = "8978:8978" ]; then
-  echo "Volume data already owned by 8978:8978, nothing to do"
+echo "Checking ownership of volume data (cloudbeaver-data)"
+if [ "$(stat -c %u:%g "/volumes/cloudbeaver-data")" = "8978:8978" ]; then
+  echo "Volume data (cloudbeaver-data) already owned by 8978:8978, nothing to do"
 else
-  echo "Chowning volume data to 8978:8978"
-  chown -R 8978:8978 /data
-  chmod 770 /data
+  echo "Chowning volume data (cloudbeaver-data) to 8978:8978"
+  chown -R 8978:8978 "/volumes/cloudbeaver-data"
+  chmod 770 "/volumes/cloudbeaver-data"
 fi
 _EOT
         destination = "local/chown.sh"
         perms       = 755
       }
-
-
       volume_mount {
         volume      = "data"
-        destination = "/data"
+        destination = "/volumes/cloudbeaver-data"
       }
 
-
       resources {
         cpu        = 10
         memory     = 10
@@ -186,7 +185,7 @@ _EOT
       driver = "docker"
 
       config {
-        image           = "danielberteaud/cloudbeaver:24.3.5-1"
+        image           = "danielberteaud/cloudbeaver:25.0.0-1"
         pids_limit      = 500
         readonly_rootfs = true
         mount {

example/images/cloudbeaver/Dockerfile

@@ -1,4 +1,4 @@
-FROM danielberteaud/java:21.25.2-2
+FROM danielberteaud/java:21-25.3-1
 LABEL maintainer="Daniel Berteaud <dbd@ehtrace.com>"
 
 ENV CLOUDBEAVER_WEB_CONFIG=/opt/cloudbeaver/conf/cloudbeaver.conf
@@ -13,12 +13,14 @@ RUN set -euxo pipefail &&\
     mkdir -p /data/workspace /data/.eclipse &&\
     chown -R cloudbeaver:cloudbeaver /data
 
-COPY --from=dbeaver/cloudbeaver:24.3.5 /opt/cloudbeaver /opt/cloudbeaver
+COPY --from=dbeaver/cloudbeaver:25.0.0 /opt/cloudbeaver /opt/cloudbeaver
 COPY root/ /
 
 RUN set -euxo pipefail &&\
     cd /opt/cloudbeaver &&\
-    ln -sf /data/.eclipse ./.eclipse
+    ln -sf /data/.eclipse ./.eclipse &&\
+    rm -rf workspace &&\
+    ln -sf /data ./workspace
 
 WORKDIR /opt/cloudbeaver
 VOLUME /data

example/images/cloudbeaver/root/usr/local/bin/cloudbeaver

@@ -8,7 +8,7 @@ if [ ! -f "/data/workspace/GlobalConfiguration/.dbeaver/data-sources.json" ]; th
   cp conf/initial-data-sources.conf /data/workspace/GlobalConfiguration/.dbeaver/data-sources.json
 fi
 
-java ${JAVA_OPTS} \
+exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
   --add-modules=ALL-SYSTEM \
   --add-opens=java.base/java.io=ALL-UNNAMED \
@@ -35,7 +35,7 @@ java ${JAVA_OPTS} \
   -jar server/plugins/org.jkiss.dbeaver.launcher*.jar \
   -product io.cloudbeaver.product.ce.product \
   -web-config ${CLOUDBEAVER_WEB_CONFIG} \
-  -data /data/.metadata \
+  -data /data/ \
   -configuration /data/.eclipse \
   -nl en \
   -registryMultiLanguage

images/cloudbeaver/Dockerfile

@@ -18,7 +18,9 @@ COPY root/ /
 
 RUN set -euxo pipefail &&\
     cd /opt/cloudbeaver &&\
-    ln -sf /data/.eclipse ./.eclipse
+    ln -sf /data/.eclipse ./.eclipse &&\
+    rm -rf workspace &&\
+    ln -sf /data ./workspace
 
 WORKDIR /opt/cloudbeaver
 VOLUME /data

images/cloudbeaver/root/usr/local/bin/cloudbeaver

@@ -8,7 +8,7 @@ if [ ! -f "/data/workspace/GlobalConfiguration/.dbeaver/data-sources.json" ]; th
   cp conf/initial-data-sources.conf /data/workspace/GlobalConfiguration/.dbeaver/data-sources.json
 fi
 
-java ${JAVA_OPTS} \
+exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
   --add-modules=ALL-SYSTEM \
   --add-opens=java.base/java.io=ALL-UNNAMED \
@@ -35,7 +35,7 @@ java ${JAVA_OPTS} \
   -jar server/plugins/org.jkiss.dbeaver.launcher*.jar \
   -product io.cloudbeaver.product.ce.product \
   -web-config ${CLOUDBEAVER_WEB_CONFIG} \
-  -data /data/.metadata \
+  -data /data/ \
   -configuration /data/.eclipse \
   -nl en \
   -registryMultiLanguage

variables.yml

@@ -7,7 +7,7 @@ instance: cloudbeaver
 cloudbeaver:
 
   # Version of cloudbeaver to deploy
-  version: 24.3.5
+  version: 25.0.0
 
   # Docker image to use
   image: '[[ .docker.repo ]]cloudbeaver:[[ .cloudbeaver.version ]]-1'