diff --git a/resources/docker-compose/scipio.yaml.j2 b/resources/docker-compose/scipio.yaml.j2 index cfa5bc9..6f65fe7 100644 --- a/resources/docker-compose/scipio.yaml.j2 +++ b/resources/docker-compose/scipio.yaml.j2 @@ -2,6 +2,15 @@ version: "{{ omni_compose_version | string }}" +x-global-env: &globalenv + SCIPIO_DB_BACKEND: MARIA + SCIPIO_DB_HOST: database + SCIPIO_DB_PORT: "3306" + SCIPIO_DB_USERNAME: root + SCIPIO_DB_PASSWORD: {{ omni_compose_app_secrets.scipio.database_password }} + SCIPIO_DB_SCHEMA: scipio + + networks: scipio: name: scipio @@ -66,15 +75,41 @@ services: networks: - scipio environment: - SCIPIO_INTERVAL: "30" - SCIPIO_DB_BACKEND: MARIA - SCIPIO_DB_HOST: database - SCIPIO_DB_PORT: "3306" - SCIPIO_DB_USERNAME: root - SCIPIO_DB_PASSWORD: {{ omni_compose_app_secrets.scipio.database_password }} - SCIPIO_DB_SCHEMA: scipio + <<: *globalenv + SCIPIO_INTERVAL: "10" SCIPIO_PHANTOM_FEED: https://blog.tipranks.com/feed/ SCIPIO_PHANTOM_HANDLER: tipranks - command: --phantom -vv + command: --phantom + deploy: + replicas: 1 + + executor: + image: scipio:{{ omni_compose_apps.scipio.versions.executor | default(omni_compose_apps.scipio.versions.default) }} + hostname: scipio-executor + depends_on: + - database + - phantom + networks: + - scipio + environment: + <<: *globalenv + SCIPIO_INTERVAL: "5" + SCIPIO_EXECUTOR_HANDLER: hologram + command: --executor + deploy: + replicas: 1 + + falcon: + image: scipio:{{ omni_compose_apps.scipio.versions.falcon | default(omni_compose_apps.scipio.versions.default) }} + hostname: scipio-falcon + depends_on: + - database + - executor + networks: + - scipio + environment: + <<: *globalenv + SCIPIO_INTERVAL: "60" + command: --falcon deploy: replicas: 1 diff --git a/vars/applications.yaml b/vars/applications.yaml index 930ca42..75b1c0a 100644 --- a/vars/applications.yaml +++ b/vars/applications.yaml @@ -2,6 +2,7 @@ omni_compose_version: 3.7 omni_compose_apps: + bitwarden: datastore: /appdata/bitwarden account: @@ -19,6 +20,7 @@ omni_compose_apps: default: 1.36.1 web: 2.15.1 attachments: 1.34.0 + gitea: datastore: /appdata/gitea account: @@ -33,6 +35,7 @@ omni_compose_apps: main: 192.168.103.0/24 versions: default: 1.11.5 + minecraft: datastore: /appdata/minecraft account: @@ -46,6 +49,7 @@ omni_compose_apps: versions: main: latest server: 1.15.2 + plex: datastore: /appdata/plex account: @@ -66,6 +70,7 @@ omni_compose_apps: main: 192.168.101.0/24 versions: default: latest + unifi: datastore: /appdata/unifi account: @@ -84,10 +89,11 @@ omni_compose_apps: main: 192.168.100.0/24 versions: default: "5.12" + scipio: build: repository: git@github.com:tjyork/Scipio.git - version: 0.3.1 + version: 0.5.2 datastore: /appdata/scipio account: name: mech_scipio @@ -100,6 +106,6 @@ omni_compose_apps: networks: main: 192.168.106.0/24 versions: - default: latest + default: 0.5.2 database: "10" - phantom: 0.3.1 + dashboard: latest