Skip to content

Commit d38281c

Browse files
authored
Merge branch 'master' into merge-fix/update-0.10.0
2 parents 8efb821 + 9e31389 commit d38281c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Docker/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ ENTRYPOINT ["/usr/bin/tini", "--"]
6464

6565
CMD ["/Kumiko/start.sh"]
6666

67-
# We want to use SIGINT instead since that is the same signal used when hitting ctrl+c
68-
# By default, this is the expected behavior of Kumiko, so we need to keep it that way
69-
# Will result in a clean exit without any dead conns
7067
STOPSIGNAL SIGTERM
7168

7269
LABEL org.opencontainers.image.title="Kumiko"

changelog.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ For the full list of changes, please see them here: [`v0.9.2...v0.10.0`](https:/
77
## :boom: Breaking Changes :boom:
88

99
- There are none :smile:
10+
-
1011
## ✨ TD;LR
1112

1213
- Pins module (pretty much works like most tags features)
@@ -18,7 +19,7 @@ For the full list of changes, please see them here: [`v0.9.2...v0.10.0`](https:/
1819
- Proper server config (both on PostgreSQL and Redis). The config is always cached on Redis first, and if doesn't exist, pulls from the database and reconstructs the cache entirely.
1920
- Clarify running migrations with the docs
2021
- Optimized Dockerfile (cut down on image size and removed unneeded things)
21-
- Update AIOHTTP to v3.8.5 (fixes CVE-2023-37276)
22+
- Update AIOHTTP to v3.8.5 (fixes [CVE-2023-37276](https://nvd.nist.gov/vuln/detail/CVE-2023-37276)) (Backported from v0.9.2)
2223
- Implement file based logging support
2324
- Upgrade Redis-Stack to 7.2.0-RC3
2425
- Use `JSON.MERGE` instead of `JSON.SET` when replacing items in the JSON document (with Redis)
@@ -49,4 +50,4 @@ For the full list of changes, please see them here: [`v0.9.2...v0.10.0`](https:/
4950
- \[Actions](deps)\: Bump actions/setup-python from 4.6.1 to 4.7.0 (#382) (@dependabot)
5051
- \[pip](deps-dev)\: Bump pyright from 1.1.317 to 1.1.318 (#387) (@dependabot)
5152
- \[pip](deps-dev)\: Bump pyinstrument from 4.5.0 to 4.5.1 (#388) (@dependabot)
52-
- \[pip](deps-dev)\: Bump ruff from 0.0.278 to 0.0.280 (#389) (@dependabot)
53+
- \[pip](deps-dev)\: Bump ruff from 0.0.278 to 0.0.280 (#389) (@dependabot)

0 commit comments

Comments
 (0)