Skip to content

Commit

Permalink
chore: Merge remote-tracking branch 'origin/main' into feature/altern…
Browse files Browse the repository at this point in the history
…ative-pubkey-management
  • Loading branch information
AnotherStranger committed Sep 22, 2023
2 parents e28b4ea + 2f28773 commit 0a18526
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [2.0.0](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.4...v2.0.0) (2023-09-14)


### ⚠ BREAKING CHANGES

* **borg:** While this is a server only image I will mark this release as BREAKING CHANGE. See https://github.com/borgbackup/borg/blob/1.2.5-cvedocs/docs/changes.rst#pre-125-archives-spoofing-vulnerability-cve-2023-36811 for a HOWTO upgrade.

### Build System

* **release:** 2.0.0-rc.1 ([a3c5f4c](https://github.com/AnotherStranger/docker-borg-backup/commit/a3c5f4c24bbd1c389cb6a223c813f42e3c35410a)), closes [/github.com/borgbackup/borg/blob/1.2.5-cvedocs/docs/changes.rst#pre-125-archives-spoofing-vulnerability-cve-2023-36811](https://github.com/AnotherStranger//github.com/borgbackup/borg/blob/1.2.5-cvedocs/docs/changes.rst/issues/pre-125-archives-spoofing-vulnerability-cve-2023-36811)
* **release:** 2.0.0-rc.2 ([ac3e417](https://github.com/AnotherStranger/docker-borg-backup/commit/ac3e4172cbcf97abed85d7aacfb0737e90b5954f))


### Bug Fixes

* **borg:** :arrow_up: Update borg to version 1.2.5. See Notes! ([6a50042](https://github.com/AnotherStranger/docker-borg-backup/commit/6a500420d282f1f957da2a5187f15f6236a15a33))


### Code Refactoring

* **docker:** :arrow_up: Update borg to 1.2.6 ([ff579e1](https://github.com/AnotherStranger/docker-borg-backup/commit/ff579e1b681031c4e30684242e60bfb9f645112c))

## [2.0.0-rc.2](https://github.com/AnotherStranger/docker-borg-backup/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2023-09-14)


Expand Down
7 changes: 7 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
],
"baseBranches": ["dev"]
}

0 comments on commit 0a18526

Please sign in to comment.