Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
dargmuesli committed Jun 6, 2024
2 parents ac4a225 + 66fb5af commit f10b844
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 37 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,13 @@

* **deps:** update ghcr.io/maevsi/maevsi to v4.9.0 ([5d12b12](https://github.com/maevsi/maevsi_stack/commit/5d12b12f23fbee322b006b6d89100f9add33cab5))

## [5.2.6](https://github.com/maevsi/maevsi_stack/compare/5.2.5...5.2.6) (2024-06-04)


### Bug Fixes

* **deps:** update ghcr.io/maevsi/maevsi to v4.9.3 ([2137c30](https://github.com/maevsi/maevsi_stack/commit/2137c308d6233a2d122b82d606ebabee7498e6ba))

## [5.2.5](https://github.com/maevsi/maevsi_stack/compare/5.2.4...5.2.5) (2024-05-20)


Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"engines": {
"node": "20"
},
"packageManager": "pnpm@9.1.2",
"packageManager": "pnpm@9.2.0",
"scripts": {
"prepare": "husky"
},
Expand All @@ -19,7 +19,7 @@
"@commitlint/config-conventional": "19.2.2",
"conventional-changelog-conventionalcommits": "8.0.0",
"dargstack": "2.2.1",
"dargstack_rgen": "0.9.34",
"dargstack_rgen": "0.9.35",
"husky": "9.0.11"
}
}
64 changes: 32 additions & 32 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/development/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ services:
- traefik.http.routers.rabbitmq_secure.rule=Host(`rabbitmq.${STACK_DOMAIN}`)
- traefik.http.routers.rabbitmq_secure.tls.options=mintls13@file #DARGSTACK-REMOVE
- traefik.http.services.rabbitmq.loadbalancer.server.port=15672
image: rabbitmq:3.13.2-management-alpine
image: rabbitmq:3.13.3-management-alpine
secrets:
- source: rabbitmq_definitions
target: /etc/rabbitmq/definitions.json
Expand Down
4 changes: 2 additions & 2 deletions src/production/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
- (( append ))
- traefik.http.routers.maevsi.middlewares=maevsi_redirectregex
- traefik.http.routers.maevsi_secure.tls.certresolver=default
image: ghcr.io/maevsi/maevsi:4.9.0
image: ghcr.io/maevsi/maevsi:4.9.3
user: (( prune ))
maevsi_beta:
# You can access the main project frontend's beta version at [beta.localhost](https://beta.localhost/).
Expand All @@ -75,7 +75,7 @@ services:
POSTGRES_DB_FILE: /run/secrets/postgres_db
POSTGRES_ROLE_MAEVSI_TUSD_PASSWORD_FILE: /run/secrets/postgres_role_maevsi-tusd_password
POSTGRES_ROLE_MAEVSI_TUSD_USERNAME_FILE: /run/secrets/postgres_role_maevsi-tusd_username
image: ghcr.io/maevsi/maevsi:4.9.0
image: ghcr.io/maevsi/maevsi:4.9.3
secrets:
- maevsi_turnstile-key
- postgres_db
Expand Down

0 comments on commit f10b844

Please sign in to comment.