Update to 24.0.2
This commit is contained in:
parent
e6162d1ede
commit
adec36d06a
|
@ -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 ]]
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 &&\
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue