diff --git a/example/cloudbeaver.nomad.hcl b/example/cloudbeaver.nomad.hcl index 68806ea..ce805c5 100644 --- a/example/cloudbeaver.nomad.hcl +++ b/example/cloudbeaver.nomad.hcl @@ -4,6 +4,8 @@ job "cloudbeaver" { region = "global" + + group "cloudbeaver" { shutdown_delay = "6s" @@ -26,8 +28,13 @@ job "cloudbeaver" { name = "cloudbeaver" port = 8978 meta { - alloc = "${NOMAD_ALLOC_INDEX}" - job = "${NOMAD_JOB_NAME}" + alloc = "${NOMAD_ALLOC_INDEX}" + datacenter = "${NOMAD_DC}" + group = "${NOMAD_GROUP_NAME}" + job = "${NOMAD_JOB_NAME}" + namespace = "${NOMAD_NAMESPACE}" + node = "${node.unique.name}" + region = "${NOMAD_REGION}" } connect { @@ -109,7 +116,7 @@ job "cloudbeaver" { driver = "docker" config { - image = "danielberteaud/cloudbeaver:24.0.0-1" + image = "danielberteaud/cloudbeaver:24.0.1-1" pids_limit = 100 readonly_rootfs = true mount { @@ -135,6 +142,8 @@ job "cloudbeaver" { CLOUDBEAVER_WEB_CONFIG = "/local/cloudbeaver.conf" } + + # Use a template block instead of env {} so we can fetch values from vault template { data = <<_EOT diff --git a/example/images/cloudbeaver/Dockerfile b/example/images/cloudbeaver/Dockerfile index 58efc39..95db1c7 100644 --- a/example/images/cloudbeaver/Dockerfile +++ b/example/images/cloudbeaver/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/java:17.24.3-1 +FROM danielberteaud/java:17.24.3-5 MAINTAINER Daniel Berteaud 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.0 /opt/cloudbeaver /opt/cloudbeaver +COPY --from=dbeaver/cloudbeaver:24.0.1 /opt/cloudbeaver /opt/cloudbeaver COPY root/ / RUN set -euxo pipefail &&\ diff --git a/variables.yml b/variables.yml index 47f3cba..409df7e 100644 --- a/variables.yml +++ b/variables.yml @@ -7,7 +7,7 @@ instance: cloudbeaver cloudbeaver: # Version of cloudbeaver to deploy - version: 24.0.0 + version: 24.0.1 # Docker image to use image: '[[ .docker.repo ]]cloudbeaver:[[ .cloudbeaver.version ]]-1'