More fixes

Author: benoit74

.github/workflows/docker-upgrade.yml

@@ -0,0 +1,28 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - upgrade
+
+jobs:
+  build-and-push:
+    name: Deploy Docker Upgrade Image
+    permissions:
+      contents: read
+      packages: write
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - name: Build and push
+        uses: openzim/docker-publish-action@v10
+        with:
+          restrict-to: kiwix/borg-backup
+          image-name: kiwix/borg-backup
+          manual-tag: upgrade
+          registries: ghcr.io
+          credentials:
+            GHCRIO_USERNAME=${{ secrets.GHCR_USERNAME }}
+            GHCRIO_TOKEN=${{ secrets.GHCR_TOKEN }}
+          repo_description: auto
+          repo_overview: auto

.github/workflows/test.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
 jobs:
-  build-and-push:
+  test-build:
     name: Test Docker Image Build
     permissions:
       contents: read

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:trixie-slim
+FROM debian:bookworm-slim
 LABEL org.opencontainers.image.source=https://github.com/kiwix/borg-backup
 #
 # Author : Florent Kaisser <florent.pro@kaisser.name>
@@ -38,7 +38,7 @@ RUN apt-get update && \
         python3 python3-pip python3-setuptools openssh-client unzip git cron \
         default-mysql-client ca-certificates \
         dnsutils bind9utils tar xz-utils gzip bzip2 coreutils grep lsb-release gnupg2 \
-        python3.13-venv && \
+        python3.11-venv && \
     install -d /usr/share/postgresql-common/pgdg && \
     curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc && \
     . /etc/os-release && \
@@ -52,10 +52,10 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     curl -Ls 'https://github.com/bitwarden/cli/releases/download/v1.22.1/bw-linux-1.22.1.zip' -o bitwarden.zip && \
     unzip bitwarden.zip && rm -f bitwarden.zip && chmod +x bw && mv bw /usr/local/bin/ && \
-    python3.13 -m venv /app/kiwix-python && \
+    python3.11 -m venv /app/kiwix-python && \
     . /app/kiwix-python/bin/activate && \
     git clone --depth=1 --branch=master https://github.com/borgbase/borgbase-api-client.git && \
-    mv borgbase-api-client/borgbase_api_client/ /app/kiwix-python/lib/python3.13/site-packages/ && \
+    mv borgbase-api-client/borgbase_api_client/ /app/kiwix-python/lib/python3.11/site-packages/ && \
     rm -rf borgbase-api-client && \
     pip3 install --no-cache-dir --upgrade requests==2.27.1 borgmatic==1.5.24 jsonschema==4.4.0 pyrsistent==0.18.1  && \
     curl -sLo /usr/bin/jq "https://github.com/jqlang/jq/releases/download/jq-1.8.1/jq-linux64" && \