diff --git a/example/images/miniflux/Dockerfile b/example/images/miniflux/Dockerfile index 39ec592..753b5ec 100644 --- a/example/images/miniflux/Dockerfile +++ b/example/images/miniflux/Dockerfile @@ -1,4 +1,4 @@ -FROM danielberteaud/alpine:24.12-2 +FROM danielberteaud/alpine:25.1-1 LABEL maintainer="Daniel Berteaud " ARG MINIFLUX_VERSION=2.2.4 diff --git a/example/miniflux.nomad.hcl b/example/miniflux.nomad.hcl index 07534fa..e893a37 100644 --- a/example/miniflux.nomad.hcl +++ b/example/miniflux.nomad.hcl @@ -110,7 +110,7 @@ job "miniflux" { user = "1053:1053" config { - image = "danielberteaud/wait-for:24.12-1" + image = "danielberteaud/wait-for:25.1-1" readonly_rootfs = true pids_limit = 20 } @@ -136,15 +136,18 @@ job "miniflux" { task "miniflux" { driver = "docker" + leader = true config { image = "danielberteaud/miniflux:2.2.4-1" readonly_rootfs = true - pids_limit = 100 + pids_limit = 500 } + + vault { role = "miniflux" env = false diff --git a/miniflux.nomad.hcl b/miniflux.nomad.hcl index 0c1fbca..60990b7 100644 --- a/miniflux.nomad.hcl +++ b/miniflux.nomad.hcl @@ -8,7 +8,7 @@ job "[[ .instance ]]" { network { mode = "bridge" -[[- if conv.ToBool .prometheus.enabled ]] +[[- if conv.ToBool .metrics.enabled ]] port "metrics" {} [[- end ]] } @@ -42,18 +42,20 @@ job "[[ .instance ]]" { task "miniflux" { driver = "[[ $c.nomad.driver ]]" + leader = true config { [[ template "common/image" $c ]] - pids_limit = 100 + pids_limit = 500 } +[[ template "common/artifacts" $c ]] [[ template "common/vault.policies" $c ]] env { LISTEN_ADDR = "127.0.0.1:8085" BASE_URL = "[[ .miniflux.public_url ]]" -[[- if conv.ToBool $c.prometheus.enabled ]] +[[- if conv.ToBool $c.metrics.enabled ]] METRICS_COLLECTOR = 1 [[- end ]] } diff --git a/variables.yml b/variables.yml index 9e3d8e3..368dc17 100644 --- a/variables.yml +++ b/variables.yml @@ -50,8 +50,8 @@ miniflux: # Disable transaction mode as it's not working correctly (a lot of rollbacks, duplicated articles etc.) mode: session - # Prometheus configuration - prometheus: + # Expose metrics + metrics: endpoints: main: target: http://127.0.0.1:8085/metrics