Skip to content

Commit fb23c64

Browse files
dargmueslidargmuesli
committed
Merge branch 'main' into beta
2 parents 058c884 + b34a665 commit fb23c64

File tree

3 files changed

+78
-6
lines changed

3 files changed

+78
-6
lines changed

‎CHANGELOG.md‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,42 @@
88

99
* **vibetype-beta:** disable ([f46055e](https://github.com/maevsi/stack/commit/f46055e588a14c7750acd754b0a9326925d5d0da))
1010

11+
## [13.4.5](https://github.com/maevsi/stack/compare/13.4.4...13.4.5) (2025-05-11)
12+
13+
### Bug Fixes
14+
15+
* **reccoom:** disable routing for production ([97a949b](https://github.com/maevsi/stack/commit/97a949bcfbbd2a7a28f0e7d6ec937cb5d0637981))
16+
17+
## [13.4.4](https://github.com/maevsi/stack/compare/13.4.3...13.4.4) (2025-05-11)
18+
19+
### Bug Fixes
20+
21+
* **vibetype:** account for nuxt content's websocket ([96b63f4](https://github.com/maevsi/stack/commit/96b63f49a3fbeb7d151195e058d4e4ac3ae4f961))
22+
23+
## [13.4.3](https://github.com/maevsi/stack/compare/13.4.2...13.4.3) (2025-05-11)
24+
25+
### Bug Fixes
26+
27+
* **traefik:** specify router entrypoints ([eeab9f7](https://github.com/maevsi/stack/commit/eeab9f7320e141bd4eaacbc08a1927996920e77d))
28+
29+
## [13.4.2](https://github.com/maevsi/stack/compare/13.4.1...13.4.2) (2025-05-09)
30+
31+
### Bug Fixes
32+
33+
* **vibetype:** upgrade to v11.0.0-beta.2 ([2dba24a](https://github.com/maevsi/stack/commit/2dba24a3a1d4cd6e77cc7c3c78c57ab98ee9b4dd))
34+
35+
## [13.4.1](https://github.com/maevsi/stack/compare/13.4.0...13.4.1) (2025-05-09)
36+
37+
### Bug Fixes
38+
39+
* **deps:** update ghcr.io/maevsi/vibetype docker tag to v10.19.0 ([4a04e9e](https://github.com/maevsi/stack/commit/4a04e9e01d006777b06cb96a2d2c598d5730fc3a))
40+
41+
## [13.4.0](https://github.com/maevsi/stack/compare/13.3.0...13.4.0) (2025-05-08)
42+
43+
### Features
44+
45+
* **vibetype:** upgrade to v11.0.0-beta.1 ([601660a](https://github.com/maevsi/stack/commit/601660a4c9b52d829c938f5b9fb84b8df662f673))
46+
1147
## [13.3.0](https://github.com/maevsi/stack/compare/13.2.1...13.3.0) (2025-05-08)
1248

1349
### Features

‎src/development/stack.yml‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ services:
9999
deploy:
100100
labels:
101101
- traefik.enable=true
102+
- traefik.http.routers.adminer.entryPoints=web
102103
- traefik.http.routers.adminer.middlewares=redirectscheme #DARGSTACK-REMOVE
103104
- traefik.http.routers.adminer.rule=Host(`adminer.${STACK_DOMAIN}`)
105+
- traefik.http.routers.adminer_secure.entryPoints=web-secure
104106
- traefik.http.routers.adminer_secure.rule=Host(`adminer.${STACK_DOMAIN}`)
105107
- traefik.http.routers.adminer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
106108
- traefik.http.services.adminer.loadbalancer.server.port=8080
@@ -148,8 +150,10 @@ services:
148150
deploy:
149151
labels:
150152
- traefik.enable=true
153+
- traefik.http.routers.grafana.entryPoints=web
151154
- traefik.http.routers.grafana.middlewares=redirectscheme #DARGSTACK-REMOVE
152155
- traefik.http.routers.grafana.rule=Host(`grafana.${STACK_DOMAIN}`)
156+
- traefik.http.routers.grafana_secure.entryPoints=web-secure
153157
- traefik.http.routers.grafana_secure.rule=Host(`grafana.${STACK_DOMAIN}`)
154158
- traefik.http.routers.grafana_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
155159
- traefik.http.services.grafana.loadbalancer.server.port=3000
@@ -189,18 +193,22 @@ services:
189193
labels: #DARGSTACK-REMOVE
190194
- traefik.enable=true #DARGSTACK-REMOVE
191195
# Minio Console
196+
- traefik.http.routers.minio.entryPoints=web #DARGSTACK-REMOVE
192197
- traefik.http.routers.minio.middlewares=redirectscheme #DARGSTACK-REMOVE
193198
- traefik.http.routers.minio.rule=Host(`minio.${STACK_DOMAIN}`) #DARGSTACK-REMOVE
194199
- traefik.http.routers.minio.service=minio #DARGSTACK-REMOVE
200+
- traefik.http.routers.minio_secure.entryPoints=web-secure #DARGSTACK-REMOVE
195201
- traefik.http.routers.minio_secure.rule=Host(`minio.${STACK_DOMAIN}`) #DARGSTACK-REMOVE
196202
- traefik.http.routers.minio_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
197203
- traefik.http.routers.minio_secure.service=minio #DARGSTACK-REMOVE
198204
- traefik.http.services.minio.loadbalancer.server.port=9001 #DARGSTACK-REMOVE
199205
- traefik.http.services.minio.loadbalancer.passhostheader=true #DARGSTACK-REMOVE
200206
# Minio itself
207+
- traefik.http.routers.s3.entryPoints=web #DARGSTACK-REMOVE
201208
- traefik.http.routers.s3.middlewares=redirectscheme #DARGSTACK-REMOVE
202209
- traefik.http.routers.s3.rule=Host(`s3.${STACK_DOMAIN}`) #DARGSTACK-REMOVE
203210
- traefik.http.routers.s3.service=s3 #DARGSTACK-REMOVE
211+
- traefik.http.routers.s3_secure.entryPoints=web-secure #DARGSTACK-REMOVE
204212
- traefik.http.routers.s3_secure.rule=Host(`s3.${STACK_DOMAIN}`) #DARGSTACK-REMOVE
205213
- traefik.http.routers.s3_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
206214
- traefik.http.routers.s3_secure.service=s3 #DARGSTACK-REMOVE
@@ -219,8 +227,10 @@ services:
219227
deploy:
220228
labels:
221229
- traefik.enable=true
230+
- traefik.http.routers.portainer.entryPoints=web
222231
- traefik.http.routers.portainer.middlewares=redirectscheme #DARGSTACK-REMOVE
223232
- traefik.http.routers.portainer.rule=Host(`portainer.${STACK_DOMAIN}`)
233+
- traefik.http.routers.portainer_secure.entryPoints=web-secure
224234
- traefik.http.routers.portainer_secure.rule=Host(`portainer.${STACK_DOMAIN}`)
225235
- traefik.http.routers.portainer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
226236
- traefik.http.services.portainer.loadbalancer.server.port=9000
@@ -250,15 +260,18 @@ services:
250260
deploy:
251261
labels:
252262
- traefik.enable=true
253-
- traefik.http.middlewares.postgraphile_auth.forwardauth.address=http://vibetype:3000/api/auth-proxy
263+
- traefik.http.middlewares.postgraphile_auth.forwardauth.address=http://vibetype:3000/api/service/traefik/authentication
254264
- traefik.http.middlewares.postgraphile_auth.forwardauth.forwardBody=true
255265
- traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowHeaders=authorization,baggage,content-type,sentry-trace,x-turnstile-key
256266
- traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowOriginList=*
267+
- traefik.http.routers.postgraphile.entryPoints=web
257268
- traefik.http.routers.postgraphile.middlewares=redirectscheme #DARGSTACK-REMOVE
258269
- traefik.http.routers.postgraphile.rule=Host(`postgraphile.${STACK_DOMAIN}`)
270+
- traefik.http.routers.postgraphile_secure.entryPoints=web-secure
259271
- traefik.http.routers.postgraphile_secure.middlewares=postgraphile_auth,postgraphile_cors
260272
- traefik.http.routers.postgraphile_secure.rule=Host(`postgraphile.${STACK_DOMAIN}`)
261273
- traefik.http.routers.postgraphile_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
274+
- traefik.http.routers.postgraphile_secure_graphiql.entryPoints=web-secure
262275
- traefik.http.routers.postgraphile_secure_graphiql.rule=Host(`postgraphile.${STACK_DOMAIN}`) && Path(`/graphiql`)
263276
- traefik.http.routers.postgraphile_secure_graphiql.tls.options=mintls13@file #DARGSTACK-REMOVE
264277
- traefik.http.services.postgraphile.loadbalancer.server.port=5000
@@ -305,8 +318,10 @@ services:
305318
deploy:
306319
labels:
307320
- traefik.enable=true
321+
- traefik.http.routers.prometheus.entryPoints=web
308322
- traefik.http.routers.prometheus.middlewares=redirectscheme #DARGSTACK-REMOVE
309323
- traefik.http.routers.prometheus.rule=Host(`prometheus.${STACK_DOMAIN}`)
324+
- traefik.http.routers.prometheus_secure.entryPoints=web-secure
310325
- traefik.http.routers.prometheus_secure.rule=Host(`prometheus.${STACK_DOMAIN}`)
311326
- traefik.http.routers.prometheus_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
312327
- traefik.http.services.prometheus.loadbalancer.server.port=9090
@@ -319,8 +334,10 @@ services:
319334
deploy:
320335
labels:
321336
- traefik.enable=true
337+
- traefik.http.routers.reccoom.entryPoints=web
322338
- traefik.http.routers.reccoom.middlewares=redirectscheme #DARGSTACK-REMOVE
323339
- traefik.http.routers.reccoom.rule=Host(`reccoom.${STACK_DOMAIN}`)
340+
- traefik.http.routers.reccoom_secure.entryPoints=web-secure
324341
- traefik.http.routers.reccoom_secure.rule=Host(`reccoom.${STACK_DOMAIN}`)
325342
- traefik.http.routers.reccoom_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
326343
- traefik.http.services.reccoom.loadbalancer.server.port=8001
@@ -347,16 +364,18 @@ services:
347364
# timeout: 10s
348365
# retries: 3
349366
# start_period: 10s
350-
image: redpandadata/redpanda:v25.1.3
367+
image: redpandadata/redpanda:v25.1.4
351368
volumes:
352369
- redpanda_data:/var/lib/redpanda/data
353370
redpanda-console:
354371
# You can access the event streaming platform's ui at [redpanda.localhost](https://redpanda.localhost/).
355372
deploy:
356373
labels:
357374
- traefik.enable=true
375+
- traefik.http.routers.redpanda.entryPoints=web
358376
- traefik.http.routers.redpanda.middlewares=redirectscheme #DARGSTACK-REMOVE
359377
- traefik.http.routers.redpanda.rule=Host(`redpanda.${STACK_DOMAIN}`)
378+
- traefik.http.routers.redpanda_secure.entryPoints=web-secure
360379
- traefik.http.routers.redpanda_secure.rule=Host(`redpanda.${STACK_DOMAIN}`)
361380
- traefik.http.routers.redpanda_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
362381
- traefik.http.services.redpanda.loadbalancer.server.port=8080
@@ -382,6 +401,7 @@ services:
382401
- --api=true
383402
- --entryPoints.web.address=:80
384403
- --entryPoints.web-secure.address=:443
404+
- --entryPoints.nuxt-content-websocket.address=:4000 #DARGSTACK-REMOVE
385405
- --providers.swarm=true
386406
- --providers.swarm.endpoint=unix:///var/run/docker.sock
387407
- --providers.swarm.exposedByDefault=false
@@ -392,9 +412,11 @@ services:
392412
labels:
393413
- traefik.enable=true
394414
- traefik.http.middlewares.redirectscheme.redirectscheme.scheme=https #DARGSTACK-REMOVE
415+
- traefik.http.routers.traefik.entryPoints=web
395416
- traefik.http.routers.traefik.middlewares=redirectscheme #DARGSTACK-REMOVE
396417
- traefik.http.routers.traefik.rule=Host(`traefik.${STACK_DOMAIN}`)
397418
- traefik.http.routers.traefik.service=api@internal
419+
- traefik.http.routers.traefik_secure.entryPoints=web-secure
398420
- traefik.http.routers.traefik_secure.rule=Host(`traefik.${STACK_DOMAIN}`)
399421
- traefik.http.routers.traefik_secure.service=api@internal
400422
- traefik.http.routers.traefik_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
@@ -413,19 +435,25 @@ services:
413435
protocol: tcp #DARGSTACK-REMOVE
414436
published: 443 #DARGSTACK-REMOVE
415437
target: 443 #DARGSTACK-REMOVE
438+
- mode: host #DARGSTACK-REMOVE
439+
protocol: tcp #DARGSTACK-REMOVE
440+
published: 4000 #DARGSTACK-REMOVE
441+
target: 4000 #DARGSTACK-REMOVE
416442
volumes:
417443
- /var/run/docker.sock:/var/run/docker.sock
418444
- ./certificates/:/etc/traefik/acme/
419445
- ./configurations/traefik/dynamic.yml:/dynamic.yml:ro #DARGSTACK-REMOVE
420446
tusd:
421447
# You can access the upload service at [tusd.localhost](https://tusd.localhost/).
422-
command: -behind-proxy --hooks-enabled-events pre-create,pre-finish,post-terminate --hooks-http http://vibetype:3000/api/tusd -max-size ${TUSD_MAX_SIZE} -s3-bucket ${TUSD_BUCKET} -s3-endpoint ${TUSD_ENDPOINT}
448+
command: -behind-proxy --hooks-enabled-events pre-create,pre-finish,post-terminate --hooks-http http://vibetype:3000/api/service/tusd -max-size ${TUSD_MAX_SIZE} -s3-bucket ${TUSD_BUCKET} -s3-endpoint ${TUSD_ENDPOINT}
423449
deploy:
424450
labels:
425451
- traefik.enable=true
452+
- traefik.http.middlewares.tusd_cors.headers.customresponseheaders.Cross-Origin-Resource-Policy=cross-origin
453+
- traefik.http.routers.tusd.entryPoints=web
426454
- traefik.http.routers.tusd.middlewares=redirectscheme #DARGSTACK-REMOVE
427455
- traefik.http.routers.tusd.rule=Host(`tusd.${STACK_DOMAIN}`)
428-
- traefik.http.middlewares.tusd_cors.headers.customresponseheaders.Cross-Origin-Resource-Policy=cross-origin
456+
- traefik.http.routers.tusd_secure.entryPoints=web-secure
429457
- traefik.http.routers.tusd_secure.middlewares=tusd_cors
430458
- traefik.http.routers.tusd_secure.rule=Host(`tusd.${STACK_DOMAIN}`) && (Method(`GET`) || Method(`HEAD`) || Method(`OPTIONS`) || Method(`POST`) || Method(`PUT`) || Method(`PATCH`))
431459
- traefik.http.routers.tusd_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
@@ -449,11 +477,18 @@ services:
449477
- traefik.http.routers.vibetype.entryPoints=web
450478
- traefik.http.routers.vibetype.middlewares=redirectscheme #DARGSTACK-REMOVE
451479
- traefik.http.routers.vibetype.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`)
480+
- traefik.http.routers.vibetype.service=vibetype #DARGSTACK-REMOVE
481+
- traefik.http.routers.vibetype_content_secure.entryPoints=nuxt-content-websocket #DARGSTACK-REMOVE
482+
- traefik.http.routers.vibetype_content_secure.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) #DARGSTACK-REMOVE
483+
- traefik.http.routers.vibetype_content_secure.service=vibetype_content #DARGSTACK-REMOVE
484+
- traefik.http.routers.vibetype_content_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
452485
- traefik.http.routers.vibetype_secure.entryPoints=web-secure
453486
- traefik.http.routers.vibetype_secure.middlewares=vibetype_cors,vibetype_redirectregex
454487
- traefik.http.routers.vibetype_secure.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`)
488+
- traefik.http.routers.vibetype_secure.service=vibetype #DARGSTACK-REMOVE
455489
- traefik.http.routers.vibetype_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
456490
- traefik.http.services.vibetype.loadbalancer.server.port=3000
491+
- traefik.http.services.vibetype_content.loadbalancer.server.port=4000 #DARGSTACK-REMOVE
457492
environment:
458493
AWS_REGION: ${VIBETYPE_AWS_REGION}
459494
CONSOLA_LEVEL: 4 # debug #DARGSTACK-REMOVE

‎src/production/production.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ services:
7878
- (( append ))
7979
- traefik.http.routers.prometheus_secure.tls.certresolver=default
8080
reccoom:
81+
deploy: (( prune ))
8182
image: ghcr.io/maevsi/reccoom:0.1.0
8283
volumes: (( prune ))
8384
sqitch:
@@ -127,7 +128,7 @@ services:
127128
- (( append ))
128129
- traefik.http.routers.vibetype.middlewares=vibetype_cors,vibetype_redirectregex
129130
- traefik.http.routers.vibetype_secure.tls.certresolver=default
130-
image: ghcr.io/maevsi/vibetype:10.17.0
131+
image: ghcr.io/maevsi/vibetype:11.0.0-beta.2
131132
user: (( prune ))
132133
# vibetype_beta:
133134
# # You can access the main project frontend's beta version at [beta.localhost](https://beta.localhost/).
@@ -151,7 +152,7 @@ services:
151152
# NUXT_PUBLIC_VIBETYPE_EMAIL_LIMIT24H: ${VIBETYPE_NUXT_PUBLIC_VIBETYPE_EMAIL_LIMIT24H}
152153
# NUXT_PUBLIC_VIO_ENVIRONMENT: beta
153154
# PGHOST: ${VIBETYPE_PGHOST}
154-
# image: ghcr.io/maevsi/vibetype:10.17.0
155+
# image: ghcr.io/maevsi/vibetype:10.19.2
155156
# secrets:
156157
# - source: vibetype_api-notification-secret
157158
# target: /run/environment-variables/NUXT_PRIVATE_API_NOTIFICATION_SECRET

0 commit comments

Comments
 (0)