add arm64 and basic updates

Author: SebastianRzk

.github/workflows/docker-to-docker-hub-with-ssh.yml

@@ -1,4 +1,4 @@
-name: CI to Docker Hub 
+name: CI to Docker Hub with ssh
 
 on:
   push:
@@ -10,38 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Checkout
-        uses: actions/checkout@v2
-      -       
-        name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      -     
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - 
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
       -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
+        name: Build and push bord backup container with ssh
+        id: docker_build_borg-backup-container
+        uses: docker/build-push-action@v6
         with:
           context: ./borg-backup-docker/
           file: ./borg-backup-docker/Dockerfile.with_ssh
-          builder: ${{ steps.buildx.outputs.name }}
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: sebastianrzk/borg-backup-container-with-ssh:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          tags: ${{ secrets.DOCKER_USERNAME }}/borg-backup-container-with-ssh:latest

.github/workflows/docker-to-docker-hub.yml

@@ -10,38 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Checkout
-        uses: actions/checkout@v2
-      -       
-        name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-      -     
-        name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - 
-        uses: docker/login-action@v1 
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
       -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
+        name: Build and push bord backup container
+        id: docker_build_borg-backup-container
+        uses: docker/build-push-action@v6
         with:
           context: ./borg-backup-docker/
           file: ./borg-backup-docker/Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
+          platforms: linux/amd64,linux/arm64
           push: true
-          tags: sebastianrzk/borg-backup-container:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+          tags: ${{ secrets.DOCKER_USERNAME }}/borg-backup-container:latest

borg-backup-docker/Dockerfile

@@ -2,8 +2,11 @@ FROM alpine
 
 ENV BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes
 COPY requirements.txt /requirements.txt
-RUN apk add python3 py3-pip borgbackup bash && pip3 install -r /requirements.txt
+RUN apk add python3 py3-pip py3-virtualenv borgbackup bash && \
+    python3 -m venv /venv && \
+    /venv/bin/pip install --upgrade pip && \
+    /venv/bin/pip install -r /requirements.txt
 COPY main.py /main.py
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-ENTRYPOINT bash /entrypoint.sh
+ENTRYPOINT ["bash", "/entrypoint.sh"]

borg-backup-docker/Dockerfile.with_ssh

@@ -2,8 +2,11 @@ FROM alpine
 
 ENV BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes
 COPY requirements.txt /requirements.txt
-RUN apk add python3 py3-pip borgbackup bash openssh && pip3 install -r /requirements.txt
+RUN apk add python3 py3-pip py3-virtualenv borgbackup bash openssh && \
+    python3 -m venv /venv && \
+    /venv/bin/pip install --upgrade pip && \
+    /venv/bin/pip install -r /requirements.txt
 COPY main.py /main.py
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-ENTRYPOINT bash /entrypoint.sh
+ENTRYPOINT ["bash", "/entrypoint.sh"]

borg-backup-docker/entrypoint.sh

@@ -8,11 +8,11 @@ declare -p | grep -Ev 'BASHOPTS|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' > /contai
 # Setup a cron schedule
 echo "SHELL=/bin/bash
 BASH_ENV=/container.env
-$BORG_BACKUP_CRON python3 /main.py
+$BORG_BACKUP_CRON source /venv/bin/activate && python3 /main.py
 # This extra line makes it a valid cron" > scheduler.txt;
 
+source /venv/bin/activate
 python3 /main.py --initial-checkup
 
 crontab scheduler.txt;
 crond -f;
-