From 6343cf13ba865c9053a70d52a5dcaea489e34a5b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 May 2025 11:02:57 +0000 Subject: [PATCH 1/4] chore(deps): update ghcr.io/renovatebot/renovate docker tag to v40 --- modules/renovate/jobspec.nomad.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/renovate/jobspec.nomad.hcl b/modules/renovate/jobspec.nomad.hcl index 1046d6d..fcbc74f 100644 --- a/modules/renovate/jobspec.nomad.hcl +++ b/modules/renovate/jobspec.nomad.hcl @@ -11,7 +11,7 @@ job "renovate" { driver = "docker" config { - image = "ghcr.io/renovatebot/renovate:39.264.0" + image = "ghcr.io/renovatebot/renovate:40.1.1" } resources { From 728f43c96e0df175ad10d1bce3bdd9c689c19449 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 May 2025 18:02:56 +0000 Subject: [PATCH 2/4] chore(deps): update codeberg.org/forgejo/forgejo docker tag to v11.0.1 --- modules/forgejo/jobspec.nomad.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/forgejo/jobspec.nomad.hcl b/modules/forgejo/jobspec.nomad.hcl index 393ed8d..1d735dc 100644 --- a/modules/forgejo/jobspec.nomad.hcl +++ b/modules/forgejo/jobspec.nomad.hcl @@ -16,7 +16,7 @@ job "forgejo" { driver = "docker" config { - image = "codeberg.org/forgejo/forgejo:11.0.0" + image = "codeberg.org/forgejo/forgejo:11.0.1" ports = ["forgejo"] From 7e1a142283179fd99dc03ebba99c376ab5c8adbe Mon Sep 17 00:00:00 2001 From: Ben Martin Date: Fri, 2 May 2025 20:31:38 +0000 Subject: [PATCH 3/4] chore(media-centre): onboard tautulli to consul service mesh --- modules/media-centre/jobspec.nomad.hcl | 52 +++++++++++++++++++------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/modules/media-centre/jobspec.nomad.hcl b/modules/media-centre/jobspec.nomad.hcl index caa191e..56789a4 100644 --- a/modules/media-centre/jobspec.nomad.hcl +++ b/modules/media-centre/jobspec.nomad.hcl @@ -1,5 +1,15 @@ job "media-centre" { group "plex" { + network { + mode = "bridge" + port "plex" { + to = 32400 + } + port "envoy_metrics" { + to = 9102 + } + } + task "plex" { driver = "docker" @@ -107,19 +117,19 @@ job "media-centre" { "traefik.consulcatalog.connect=true", ] } + } + group "tautulli" { network { mode = "bridge" - port "plex" { - to = 32400 + port "tautulli" { + to = 8181 } port "envoy_metrics" { to = 9102 } } - } - - group "tautulli" { + task "tautulli" { driver = "docker" @@ -147,18 +157,34 @@ job "media-centre" { service { provider = "consul" - port = "tautulli" + port = "8181" + + meta { + envoy_metrics_port = "${NOMAD_HOST_PORT_envoy_metrics}" + } + + connect { + sidecar_service { + proxy { + expose { + path { + path = "/metrics" + protocol = "http" + local_path_port = 9102 + listener_port = "envoy_metrics" + } + } + transparent_proxy {} + } + } + } + tags = [ "traefik.enable=true", "traefik.http.routers.tautulli.entrypoints=websecure", - "traefik.http.routers.tautulli.rule=Host(`tautulli.brmartin.co.uk`)" + "traefik.http.routers.tautulli.rule=Host(`tautulli.brmartin.co.uk`)", + "traefik.consulcatalog.connect=true", ] } - - network { - port "tautulli" { - to = 8181 - } - } } } From c7c43eaeb0edeccf73f518a90e2dca37e07b8a23 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 3 May 2025 14:01:55 +0000 Subject: [PATCH 4/4] chore(deps): update ghcr.io/renovatebot/renovate docker tag to v40 --- modules/renovate/jobspec.nomad.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/renovate/jobspec.nomad.hcl b/modules/renovate/jobspec.nomad.hcl index 1046d6d..7414b09 100644 --- a/modules/renovate/jobspec.nomad.hcl +++ b/modules/renovate/jobspec.nomad.hcl @@ -11,7 +11,7 @@ job "renovate" { driver = "docker" config { - image = "ghcr.io/renovatebot/renovate:39.264.0" + image = "ghcr.io/renovatebot/renovate:40.1.2" } resources {