diff --git a/services/cojedzie/stack.yml b/services/cojedzie/stack.yml index 63fddb1..e3d0778 100644 --- a/services/cojedzie/stack.yml +++ b/services/cojedzie/stack.yml @@ -2,7 +2,7 @@ version: '{{ compose_version }}' services: api: - image: cojedzie/api:latest + image: cojedzie/api:{{ cojedzie_version }} networks: - "{{ ingress_network }}" - default @@ -15,6 +15,9 @@ services: deploy: mode: replicated replicas: 1 + update_config: + parallelism: 1 + order: start-first labels: - traefik.enable=true - traefik.http.routers.{{ service }}-api.rule=(Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)) && (PathPrefix(`/api/`) || PathPrefix(`/bundles/`)) @@ -22,27 +25,9 @@ services: - traefik.http.routers.{{ service }}-api.tls=true - traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt - traefik.http.services.{{ service }}-api.loadbalancer.server.port=8080 - - update-job: - image: cojedzie/api:latest - command: ["console", "app:update", "--async"] - networks: - - default - volumes: - - db_data:/var/db - env_file: - - ./environment - deploy: - mode: replicated - replicas: 0 - labels: - - "swarm.cronjob.enable=true" - - "swarm.cronjob.schedule={{ cojedzie_update_cron }}" - restart_policy: - condition: none cron: - image: cojedzie/cron:latest + image: cojedzie/cron:{{ cojedzie_version }} env_file: - ./environment volumes: @@ -51,7 +36,7 @@ services: - api worker: - image: cojedzie/worker:latest + image: cojedzie/worker:{{ cojedzie_version }} env_file: - ./environment volumes: @@ -83,7 +68,7 @@ services: - traefik.http.services.{{ service }}-mercure.loadbalancer.server.port=80 front: - image: cojedzie/front:latest + image: cojedzie/front:{{ cojedzie_version }} networks: - "{{ ingress_network }}" - default @@ -91,9 +76,13 @@ services: - api environment: - APP_GTM={{ cojedzie_gtm }} + - APP_MAPTILER_KEY={{ cojedzie_maptiler }} deploy: mode: replicated replicas: 1 + update_config: + parallelism: 1 + order: start-first labels: - traefik.enable=true - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`) diff --git a/services/cojedzie/vars/main.yml b/services/cojedzie/vars/main.yml index a11c42e..14dd345 100644 --- a/services/cojedzie/vars/main.yml +++ b/services/cojedzie/vars/main.yml @@ -1,5 +1,6 @@ --- cojedzie_domain: cojedzie.pl +cojedzie_version: '2021.2.0' cojedzie_update_cron: 0 0 4 * * * cojedzie_gtm: "" cojedzie_mercure_jwt_key: !vault | @@ -10,3 +11,4 @@ cojedzie_mercure_jwt_key: !vault | 3931313836313133390a316562333130366435633335613066373232363439623932656532373032 62646432343334346165653466633634356635323038306435343932386233323164633134373964 6232656562626566663964643634366532393136383261333931 +cojedzie_maptiler: 8GX5FRUNgk4lB83GZT8Q