cojedzie: Per-image versions, replace cron with scheduler worker
- Split cojedzie_version into front/api/worker versions so CI can pin each by digest - Replace the cron service with a worker consuming the scheduler queues - Pull images from registry.kadet.net, fall back to latest on full runs - Drop pinned serverVersion from DATABASE_URL Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
bf9d98a0d5
commit
5185b00b84
@ -1,8 +1,19 @@
|
|||||||
version: "{{ compose_version }}"
|
version: "{{ compose_version }}"
|
||||||
|
|
||||||
|
x-defaults:
|
||||||
|
worker: &worker
|
||||||
|
image: {{ cojedzie_image_base }}/worker:{{ cojedzie_worker_version }}
|
||||||
|
env_file:
|
||||||
|
- ./api.env
|
||||||
|
- ./sentry.env
|
||||||
|
volumes:
|
||||||
|
- db_data:/var/db
|
||||||
|
depends_on:
|
||||||
|
- api
|
||||||
|
|
||||||
services:
|
services:
|
||||||
api:
|
api:
|
||||||
image: {{ cojedzie_image_base }}/api:{{ cojedzie_version }}
|
image: {{ cojedzie_image_base }}/api:{{ cojedzie_api_version }}
|
||||||
networks:
|
networks:
|
||||||
- "{{ ingress_network }}"
|
- "{{ ingress_network }}"
|
||||||
- default
|
- default
|
||||||
@ -27,25 +38,14 @@ services:
|
|||||||
- traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt
|
- traefik.http.routers.{{ service }}-api.tls.certresolver=lets-encrypt
|
||||||
- traefik.http.services.{{ service }}-api.loadbalancer.server.port=8080
|
- traefik.http.services.{{ service }}-api.loadbalancer.server.port=8080
|
||||||
|
|
||||||
cron:
|
schedule:
|
||||||
image: {{ cojedzie_image_base }}/cron:{{ cojedzie_version }}
|
<<: *worker
|
||||||
env_file:
|
environment:
|
||||||
- ./api.env
|
COJEDZIE_WORKER_OPTS: '-vv'
|
||||||
- ./sentry.env
|
COJEDZIE_WORKER_QUEUES: 'scheduler_default scheduler_hub'
|
||||||
volumes:
|
|
||||||
- db_data:/var/db
|
|
||||||
depends_on:
|
|
||||||
- api
|
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
image: {{ cojedzie_image_base }}/worker:{{ cojedzie_version }}
|
<<: *worker
|
||||||
env_file:
|
|
||||||
- ./api.env
|
|
||||||
- ./sentry.env
|
|
||||||
volumes:
|
|
||||||
- db_data:/var/db
|
|
||||||
depends_on:
|
|
||||||
- api
|
|
||||||
|
|
||||||
mercure:
|
mercure:
|
||||||
image: dunglas/mercure:{{ cojedzie_mercure_version|default('latest') }}
|
image: dunglas/mercure:{{ cojedzie_mercure_version|default('latest') }}
|
||||||
@ -71,7 +71,7 @@ services:
|
|||||||
- traefik.http.services.{{ service }}-mercure.loadbalancer.server.port=80
|
- traefik.http.services.{{ service }}-mercure.loadbalancer.server.port=80
|
||||||
|
|
||||||
front:
|
front:
|
||||||
image: {{ cojedzie_image_base }}/front:{{ cojedzie_version }}
|
image: {{ cojedzie_image_base }}/front:{{ cojedzie_front_version }}
|
||||||
networks:
|
networks:
|
||||||
- "{{ ingress_network }}"
|
- "{{ ingress_network }}"
|
||||||
- default
|
- default
|
||||||
|
|||||||
@ -6,10 +6,9 @@
|
|||||||
source: pull
|
source: pull
|
||||||
force_source: yes
|
force_source: yes
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ cojedzie_image_base }}/front:{{ cojedzie_version }}"
|
- "{{ cojedzie_image_base }}/front:{{ cojedzie_front_version }}"
|
||||||
- "{{ cojedzie_image_base }}/api:{{ cojedzie_version }}"
|
- "{{ cojedzie_image_base }}/api:{{ cojedzie_api_version }}"
|
||||||
- "{{ cojedzie_image_base }}/worker:{{ cojedzie_version }}"
|
- "{{ cojedzie_image_base }}/worker:{{ cojedzie_worker_version }}"
|
||||||
- "{{ cojedzie_image_base }}/cron:{{ cojedzie_version }}"
|
|
||||||
loop_control:
|
loop_control:
|
||||||
loop_var: image
|
loop_var: image
|
||||||
notify:
|
notify:
|
||||||
|
|||||||
@ -2,7 +2,7 @@ MERCURE_URL=http://mercure/.well-known/mercure
|
|||||||
MERCURE_PUBLIC_URL=https://{{ cojedzie_domain }}/.well-known/mercure
|
MERCURE_PUBLIC_URL=https://{{ cojedzie_domain }}/.well-known/mercure
|
||||||
MERCURE_JWT_SECRET={{ cojedzie_mercure_jwt_key }}
|
MERCURE_JWT_SECRET={{ cojedzie_mercure_jwt_key }}
|
||||||
|
|
||||||
DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }}?serverVersion=mariadb-10.7.1
|
DATABASE_URL=mysql://{{ cojedzie_database.user }}:{{ cojedzie_database.password }}@{{ database_mysql_host }}/{{ cojedzie_database.name }}
|
||||||
|
|
||||||
SENTRY_DSN={{ sentry_dsn_api }}
|
SENTRY_DSN={{ sentry_dsn_api }}
|
||||||
SENTRY_SAMPLE_RATE={{ sentry_sample_rate_api }}
|
SENTRY_SAMPLE_RATE={{ sentry_sample_rate_api }}
|
||||||
|
|||||||
@ -13,6 +13,9 @@ cojedzie_mercure_jwt_key: !vault |
|
|||||||
cojedzie_maptiler: 8GX5FRUNgk4lB83GZT8Q
|
cojedzie_maptiler: 8GX5FRUNgk4lB83GZT8Q
|
||||||
cojedzie_image_base: docker.io/cojedzie
|
cojedzie_image_base: docker.io/cojedzie
|
||||||
cojedzie_version: latest
|
cojedzie_version: latest
|
||||||
|
cojedzie_front_version: "{{ cojedzie_version }}"
|
||||||
|
cojedzie_api_version: "{{ cojedzie_version }}"
|
||||||
|
cojedzie_worker_version: "{{ cojedzie_version }}"
|
||||||
sentry_dsn_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
|
sentry_dsn_api: https://fd114053dd724e0eb16011ac0da16ba1@o4505224124891136.ingest.sentry.io/4505224126332928
|
||||||
sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
|
sentry_dsn_front: https://2815d4e0251240fcb9cd8c81c31e86fe@o4505224124891136.ingest.sentry.io/4505224128233472
|
||||||
sentry_sample_rate_api: 0.05
|
sentry_sample_rate_api: 0.05
|
||||||
|
|||||||
@ -180,7 +180,10 @@ service_config:
|
|||||||
62643132313336356365313465353263626565616434633963343764653330316566613633633638
|
62643132313336356365313465353263626565616434633963343764653330316566613633633638
|
||||||
623838613832393239343036396439383561
|
623838613832393239343036396439383561
|
||||||
cojedzie:
|
cojedzie:
|
||||||
cojedzie_version: "2023.1.5"
|
# releases are deployed by CI pinned by digest, see the Release workflow in cojedzie/cojedzie;
|
||||||
|
# full playbook runs fall back to the latest release
|
||||||
|
cojedzie_version: latest
|
||||||
|
cojedzie_image_base: registry.kadet.net/cojedzie
|
||||||
cojedzie_gtm: GTM-TQNX386
|
cojedzie_gtm: GTM-TQNX386
|
||||||
|
|
||||||
cojedzie_database:
|
cojedzie_database:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user