chore: 🔀 Merge branch 'main' into feature/alternative-pubkey-management

AnotherStranger · May 17, 2023 · b63d026 · b63d026
2 parents f2ab3b8 + da5fc25
commit b63d026
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [1.10.0](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.9.3...v1.10.0) (2023-05-17)
+
+
+### Features
+
+* **docker:** :arrow_up: Update python baseimage to python 3.11 ([936dd6f](https://github.com/AnotherStranger/docker-borg-backup/commit/936dd6fe55234456814f3b73773b13db53e64122))
+
+# [1.10.0-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.9.3...v1.10.0-rc.1) (2023-05-16)
+
+
+### Features
+
+* **docker:** :arrow_up: Update python baseimage to python 3.11 ([936dd6f](https://github.com/AnotherStranger/docker-borg-backup/commit/936dd6fe55234456814f3b73773b13db53e64122))
+
 ## [1.9.3](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.9.2...v1.9.3) (2023-05-05)
 
 ## [1.9.3-rc.1](https://github.com/AnotherStranger/docker-borg-backup/compare/v1.9.2...v1.9.3-rc.1) (2023-05-03)

diff --git a/Dockerfile b/Dockerfile
@@ -2,25 +2,25 @@
 #                             PIN PACKAGE VERSIONS                             #
 ################################################################################
 ARG BORGBACKUP_VERSION="1.2.4"
-ARG PYTHON_VERSION="3.10"
-ARG OPENSSH_VERSION="9.1_p1-r2"
-ARG SED_VERSION="4.9-r0"
-ARG BASH_VERSION="5.2.15-r0"
-ARG SHADOW_VERSION="4.13-r0"
-ARG OPENSSL_VERSION="3.0.8-r4"
-ARG PKG_CONF_VERSION="1.9.4-r0"
-ARG GCC_VERSION="12.2.1_git20220924-r4"
-ARG MUSL_VERSION="1.2.3-r4"
-ARG ACL_VERSION="2.3.1-r1"
-ARG XXHASH_VERSION="0.8.1-r0"
-ARG ZSTD_VERSION="1.5.5-r0"
-ARG LZ4_VERSION="1.9.4-r1"
-ARG LINUX_HEADERS_VERSION="5.19.5-r0"
+ARG PYTHON_VERSION="3.11"
+ARG OPENSSH_VERSION="9.3_p1-r3"
+ARG SED_VERSION="4.9-r2"
+ARG BASH_VERSION="5.2.15-r3"
+ARG SHADOW_VERSION="4.13-r2"
+ARG OPENSSL_VERSION="3.1.0-r4"
+ARG PKG_CONF_VERSION="1.9.5-r0"
+ARG GCC_VERSION="12.2.1_git20220924-r10"
+ARG MUSL_VERSION="1.2.4-r0"
+ARG ACL_VERSION="2.3.1-r3"
+ARG XXHASH_VERSION="0.8.1-r4"
+ARG ZSTD_VERSION="1.5.5-r4"
+ARG LZ4_VERSION="1.9.4-r4"
+ARG LINUX_HEADERS_VERSION="6.3-r0"
 
 ################################################################################
 #                    BUILD BORGBACKUP FROM SOURCE USING PIP                    #
 ################################################################################
-FROM python:"${PYTHON_VERSION}"-alpine as builder
+FROM python:"${PYTHON_VERSION}"-alpine AS builder
 
 # Re-define needed ARGS
 ARG BORGBACKUP_VERSION
@@ -52,7 +52,7 @@ RUN set -x && \
 ################################################################################
 #                INSTALL BUILT BORGBACKUP PACKAGE IN NEW STAGE                 #
 ################################################################################
-FROM python:"${PYTHON_VERSION}"-alpine as runtime-image
+FROM python:"${PYTHON_VERSION}"-alpine AS runtime-image
 
 # Re-define needed ARGS
 ARG OPENSSH_VERSION