diff --git a/.gitignore b/.gitignore index c16ac5c..716fa63 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .trivy* .version +.idea/ +.vscode/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d657593..96f1096 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: end-of-file-fixer - id: check-added-large-files - repo: https://github.com/commitizen-tools/commitizen - rev: v2.42.1 + rev: 3.6.0 hooks: - id: commitizen stages: @@ -24,13 +24,13 @@ repos: - -t - warning - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.33.0 + rev: v0.35.0 hooks: - id: markdownlint-fix args: - "-i" - "CHANGELOG.md" - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.9.0.2 + rev: v0.9.0.5 hooks: - id: shellcheck diff --git a/CHANGELOG.md b/CHANGELOG.md index e4c429d..6e690c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +## [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) + + +### 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.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.4...v2.0.0-rc.1) (2023-08-31) + + +### ⚠ 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. + +### Bug Fixes + +* **borg:** :arrow_up: Update borg to version 1.2.5. See Notes! ([6a50042](https://github.com/AnotherStranger/docker-borg-backup/commit/6a500420d282f1f957da2a5187f15f6236a15a33)) + +## [1.10.4](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.3...v1.10.4) (2023-08-09) + + +### Build System + +* **release:** 1.10.4-rc.1 ([efae856](https://github.com/AnotherStranger/docker-borg-backup/commit/efae85620ae54161c151d7c7f56a66cd486cfab3)) + + +### Code Refactoring + +* **docker:** :arrow_up: upgrade docker image dependencies ([5ac6c00](https://github.com/AnotherStranger/docker-borg-backup/commit/5ac6c00d1284f52f43d1900f62eb6fb5321f07bf)) + +## [1.10.4-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.3...v1.10.4-rc.1) (2023-08-09) + + +### Code Refactoring + +* **docker:** :arrow_up: upgrade docker image dependencies ([5ac6c00](https://github.com/AnotherStranger/docker-borg-backup/commit/5ac6c00d1284f52f43d1900f62eb6fb5321f07bf)) + ## [1.10.3](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.10.2...v1.10.3) (2023-06-19) diff --git a/Dockerfile b/Dockerfile index e55001a..21f9319 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ ################################################################################ # PIN PACKAGE VERSIONS # ################################################################################ -ARG BORGBACKUP_VERSION="1.2.4" +ARG BORGBACKUP_VERSION="1.2.6" ARG PYTHON_VERSION="3.11" -ARG OPENSSH_VERSION="9.3_p1-r3" +ARG OPENSSH_VERSION="9.3_p2-r0" ARG SED_VERSION="4.9-r2" ARG BASH_VERSION="5.2.15-r5" ARG SHADOW_VERSION="4.13-r4" -ARG OPENSSL_VERSION="3.1.1-r1" +ARG OPENSSL_VERSION="3.1.2-r0" ARG PKG_CONF_VERSION="1.9.5-r0" ARG GCC_VERSION="12.2.1_git20220924-r10" -ARG MUSL_VERSION="1.2.4-r0" +ARG MUSL_VERSION="1.2.4-r1" ARG ACL_VERSION="2.3.1-r3" -ARG XXHASH_VERSION="0.8.1-r4" +ARG XXHASH_VERSION="0.8.2-r0" ARG ZSTD_VERSION="1.5.5-r4" ARG LZ4_VERSION="1.9.4-r4" ARG LINUX_HEADERS_VERSION="6.3-r0"