diff --git a/modules/forgejo/jobspec.nomad.hcl b/modules/forgejo/jobspec.nomad.hcl index 1d735dc..393ed8d 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.1" + image = "codeberg.org/forgejo/forgejo:11.0.0" ports = ["forgejo"] diff --git a/modules/media-centre/jobspec.nomad.hcl b/modules/media-centre/jobspec.nomad.hcl index 56789a4..caa191e 100644 --- a/modules/media-centre/jobspec.nomad.hcl +++ b/modules/media-centre/jobspec.nomad.hcl @@ -1,15 +1,5 @@ job "media-centre" { group "plex" { - network { - mode = "bridge" - port "plex" { - to = 32400 - } - port "envoy_metrics" { - to = 9102 - } - } - task "plex" { driver = "docker" @@ -117,19 +107,19 @@ job "media-centre" { "traefik.consulcatalog.connect=true", ] } - } - group "tautulli" { network { mode = "bridge" - port "tautulli" { - to = 8181 + port "plex" { + to = 32400 } port "envoy_metrics" { to = 9102 } } - + } + + group "tautulli" { task "tautulli" { driver = "docker" @@ -157,34 +147,18 @@ job "media-centre" { service { provider = "consul" - 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 {} - } - } - } - + port = "tautulli" tags = [ "traefik.enable=true", "traefik.http.routers.tautulli.entrypoints=websecure", - "traefik.http.routers.tautulli.rule=Host(`tautulli.brmartin.co.uk`)", - "traefik.consulcatalog.connect=true", + "traefik.http.routers.tautulli.rule=Host(`tautulli.brmartin.co.uk`)" ] } + + network { + port "tautulli" { + to = 8181 + } + } } } diff --git a/modules/renovate/jobspec.nomad.hcl b/modules/renovate/jobspec.nomad.hcl index 7414b09..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:40.1.2" + image = "ghcr.io/renovatebot/renovate:40.1.1" } resources {