Cleanup
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
FROM danielberteaud/alpine:25.2-1
|
||||
FROM danielberteaud/alpine:25.3-1
|
||||
LABEL maintainer="Daniel Berteaud <dbd@ehtrace.com>"
|
||||
|
||||
ARG MINIFLUX_VERSION=2.2.6
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
vault write database/roles/miniflux \
|
||||
vault write database/roles/postgres-miniflux \
|
||||
db_name="postgres" \
|
||||
creation_statements="CREATE ROLE \"{{name}}\" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; \
|
||||
GRANT \"miniflux\" TO \"{{name}}\"; \
|
||||
@@ -111,7 +111,7 @@ job "miniflux" {
|
||||
user = "1053:1053"
|
||||
|
||||
config {
|
||||
image = "danielberteaud/wait-for:25.2-1"
|
||||
image = "danielberteaud/wait-for:25.3-1"
|
||||
readonly_rootfs = true
|
||||
pids_limit = 20
|
||||
}
|
||||
@@ -178,7 +178,7 @@ _EOT
|
||||
|
||||
template {
|
||||
data = <<_EOT
|
||||
DATABASE_URL=postgresql://{{ with secret "database/creds/miniflux" }}{{ .Data.username }}{{ end }}:{{ with secret "database/creds/miniflux" }}{{ urlquery .Data.password }}{{ end }}@127.0.0.1:5432/miniflux?sslmode=disable
|
||||
DATABASE_URL=postgresql://{{ with secret "database/creds/postgres-miniflux" }}{{ .Data.username }}{{ end }}:{{ with secret "database/creds/postgres-miniflux" }}{{ urlquery .Data.password }}{{ end }}@127.0.0.1:5432/miniflux?sslmode=disable
|
||||
_EOT
|
||||
destination = "secrets/.db.env"
|
||||
perms = 400
|
||||
|
||||
@@ -29,12 +29,6 @@ miniflux:
|
||||
- destination_name: 'postgres[[ .consul.suffix ]]'
|
||||
local_bind_port: 5432
|
||||
|
||||
vault:
|
||||
workload_identity:
|
||||
role:
|
||||
token_policies:
|
||||
- '[[ .instance ]][[ .consul.suffix ]]'
|
||||
|
||||
# Additional env var to pass to the container
|
||||
env: {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user