aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-07-01 15:36:54 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-07-01 15:36:54 +0200
commit1277d94bec5cccb62695da34a7ffb156f471eb6e (patch)
tree37134d734212a2ba1b5a2ffe508bb9b3e96f201d
parentb9f0f012bd99143effd2527097dcead7240a4a47 (diff)
downloadinfrastructure-1277d94bec5cccb62695da34a7ffb156f471eb6e.tar.gz
infrastructure-1277d94bec5cccb62695da34a7ffb156f471eb6e.zip
Remove easybridge + increase nomad docker timeout when pulling images
-rw-r--r--app/im/deploy/im.hcl80
-rw-r--r--os/config/roles/nomad/templates/nomad.hcl.j27
2 files changed, 7 insertions, 80 deletions
diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl
index 345cf8c..42c604d 100644
--- a/app/im/deploy/im.hcl
+++ b/app/im/deploy/im.hcl
@@ -129,86 +129,6 @@ job "im" {
}
}
- group "easybridge" {
- count = 1
-
- network {
- port "api_port" {
- static = 8321
- to = 8321
- }
- port "web_port" { to = 8281 }
- }
-
- task "easybridge" {
- driver = "docker"
- config {
- image = "lxpz/easybridge_amd64:35"
- ports = [ "api_port", "web_port" ]
- volumes = [
- "secrets/conf:/data"
- ]
- args = [ "./easybridge", "-config", "/data/config.json" ]
- }
-
- template {
- data = file("../config/easybridge/registration.yaml.tpl")
- destination = "secrets/conf/registration.yaml"
- }
-
- template {
- data = file("../config/easybridge/config.json.tpl")
- destination = "secrets/conf/config.json"
- }
-
- resources {
- memory = 250
- cpu = 100
- }
-
- service {
- name = "easybridge-api"
- tags = ["easybridge-api"]
- port = "api_port"
- address_mode = "host"
- check {
- type = "tcp"
- port = "api_port"
- interval = "60s"
- timeout = "5s"
- check_restart {
- limit = 3
- grace = "90s"
- ignore_warnings = false
- }
- }
- }
-
- service {
- name = "easybridge-web"
- tags = [
- "easybridge-web",
- "traefik.enable=true",
- "traefik.frontend.entryPoints=https,http",
- "traefik.frontend.rule=Host:easybridge.deuxfleurs.fr",
- ]
- port = "web_port"
- address_mode = "host"
- check {
- type = "tcp"
- port = "web_port"
- interval = "60s"
- timeout = "5s"
- check_restart {
- limit = 3
- grace = "90s"
- ignore_warnings = false
- }
- }
- }
- }
- }
-
group "riotweb" {
count = 1
diff --git a/os/config/roles/nomad/templates/nomad.hcl.j2 b/os/config/roles/nomad/templates/nomad.hcl.j2
index d1c0720..f44ccaa 100644
--- a/os/config/roles/nomad/templates/nomad.hcl.j2
+++ b/os/config/roles/nomad/templates/nomad.hcl.j2
@@ -39,3 +39,10 @@ telemetry {
publish_allocation_metrics = true
publish_node_metrics = true
}
+
+plugin "docker" {
+ config {
+ pull_activity_timeout = "15m"
+ }
+}
+