diff --git a/stack.production.yml b/stack.production.yml index c036760..33ede65 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -1,25 +1,60 @@ +networks: + ingress: + external: false + +volumes: + logs: + driver: local + services: - oculus: - image: git.nixc.us/colin/oculus:production + ## Ingress.nixc.us ## + reporter-ingress: + image: git.nixc.us/colin/oculus:production-reporter environment: - GLITCHTIP_DSN: "" + - GLITCHTIP_DSN="https://05d1c1847e814dca976b68b462c86b63@glitch.nixc.us/8" volumes: - - /mnt/tank/persist/nixc.us/oculus/production/data:/log - - "/var/run/docker.sock:/var/run/docker.sock:ro" + - logs:/logs + networks: + - ingress + labels: + traefik.enable: "false" + oculus.containerid: "reporter-ingress" + oculus.ignorelist: "/logs/,/tmp/" + oculus.mode: "monitor" + oculus.interval: "300s" deploy: placement: constraints: - - node.role == manager - labels: - traefik.enable: "false" - oculus.containerid: "oculus" - oculus.ignorelist: "/log/,/tmp/" - oculus.mode: "monitor" - oculus.interval: "60s" + - node.hostname == ingress.nixc.us + update_config: + order: stop-first + failure_action: rollback + delay: 10s + parallelism: 1 + restart_policy: + condition: on-failure + api-ingress: + image: git.nixc.us/colin/oculus:production-monitor + environment: + - GLITCHTIP_DSN="https://05d1c1847e814dca976b68b462c86b63@glitch.nixc.us/8" + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - ingress + labels: + traefik.enable: "false" + oculus.containerid: "api-ingress" + oculus.ignorelist: "" + oculus.mode: "monitor" + oculus.interval: "300s" + deploy: + placement: + constraints: + - node.hostname == ingress.nixc.us update_config: order: stop-first failure_action: rollback delay: 0s parallelism: 1 restart_policy: - condition: on-failure \ No newline at end of file + condition: on-failure diff --git a/stack.staging.yml b/stack.staging.yml index 9976590..582f9f4 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,20 +1,60 @@ +networks: + ingress: + external: false + +volumes: + logs: + driver: local + services: - oculus: - image: git.nixc.us/colin/oculus:staging + reporter-ingress: + image: git.nixc.us/colin/oculus:staging-reporter environment: - GLITCHTIP_DSN: "" + - GLITCHTIP_DSN="https://05d1c1847e814dca976b68b462c86b63@glitch.nixc.us/8" # volumes: - # - /mnt/tank/persist/nixc.us/oculus/staging/data:/log + # - logs:/logs + networks: + - ingress + labels: + traefik.enable: "false" + oculus.containerid: "reporter-ingress" + oculus.ignorelist: "/logs/,/tmp/" + oculus.mode: "monitor" + oculus.interval: "300s" deploy: - # placement: - # constraints: - # - node.hostname == macmini14 - labels: - traefik.enable: "false" + placement: + constraints: + - node.hostname == ingress.nixc.us update_config: order: stop-first failure_action: rollback delay: 0s parallelism: 1 restart_policy: - condition: on-failure \ No newline at end of file + condition: on-failure + + api-ingress: + image: git.nixc.us/colin/oculus:staging-monitor + environment: + - GLITCHTIP_DSN="https://05d1c1847e814dca976b68b462c86b63@glitch.nixc.us/8" + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - ingress + labels: + traefik.enable: "false" + oculus.containerid: "api-ingress" + oculus.ignorelist: "" + oculus.mode: "monitor" + oculus.interval: "300s" + deploy: + placement: + constraints: + - node.hostname == ingress.nixc.us + update_config: + order: stop-first + failure_action: rollback + delay: 0s + parallelism: 1 + restart_policy: + condition: on-failure