From 8cd1bb73f18d59509e392144909952913296de10 Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Fri, 3 Mar 2023 08:26:09 +0000
Subject: [PATCH 1/7] Upped to 1.7.8 and stopped compiling supercronic

---
 base/Dockerfile       | 34 +++++++++++++++-------------------
 base/requirements.txt |  2 +-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index b98183d..b95ab6b 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,10 +1,5 @@
 # syntax = docker/dockerfile:latest
-FROM golang:1.20.0-alpine3.17 AS gobuilder
-ARG SUPERCRONIC_VERSION="v0.2.1"
-RUN apk add --no-cache git
-RUN go install github.com/aptible/supercronic@"${SUPERCRONIC_VERSION}"
-
-FROM python:3.11.1-alpine3.17
+FROM python:3.11.2-alpine3.17
 LABEL maintainer='b3vis'
 VOLUME /mnt/source
 VOLUME /mnt/borg-repository
@@ -14,28 +9,29 @@ VOLUME /root/.config/borg
 VOLUME /root/.ssh
 VOLUME /root/.cache/borg
 RUN apk add --update --no-cache \
-    tzdata \
-    sshfs \
-    openssl1.1-compat \
-    fuse \
+    bash \
+    bash-completion \
+    bash-doc \
     ca-certificates \
+    curl \
+    findmnt \
+    fuse \
+    libacl \
+    libxxhash \
     logrotate \
     lz4-libs \
-    libacl \
-    postgresql-client \
     mariadb-client \
-    mongodb-tools \
-    curl \
-    findmnt \
-    bash \
-    bash-completion \
-    bash-doc \
     mariadb-connector-c \
+    mongodb-tools \
+    openssl1.1-compat \
+    postgresql-client \
+    sshfs \
+    supercronic \
+    tzdata \
     && rm -rf \
     /var/cache/apk/* \
     /.cache
 
-COPY --from=gobuilder /go/bin/supercronic /usr/local/bin/
 COPY --chmod=755 entry.sh /entry.sh
 COPY --link requirements.txt /
 
diff --git a/base/requirements.txt b/base/requirements.txt
index f7bec5b..b86fa82 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -3,4 +3,4 @@
 apprise==1.2.1
 borgbackup==1.2.3
 llfuse==1.4.2
-borgmatic==1.7.7
+borgmatic==1.7.8

From a10ee41e536b0d71d4bac87577dad571b15c4892 Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Fri, 3 Mar 2023 08:28:53 +0000
Subject: [PATCH 2/7] Update maintainer

---
 base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index b95ab6b..26aac6e 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:latest
 FROM python:3.11.2-alpine3.17
-LABEL maintainer='b3vis'
+LABEL maintainer='github.com/borgmatic-collective'
 VOLUME /mnt/source
 VOLUME /mnt/borg-repository
 VOLUME /root/.borgmatic

From 570ff6c6dfe9a24e1cdd40ee3c7cac50e18effab Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 12:31:03 +0000
Subject: [PATCH 3/7] switch to cloudsmith

---
 base/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/requirements.txt b/base/requirements.txt
index b86fa82..d98b0b3 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,4 +1,4 @@
---extra-index-url https://borgmatic-collective.github.io/pypi/simple
+--extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/
 
 apprise==1.2.1
 borgbackup==1.2.3

From 8b5cad2b471a6d0ad24e56d8160d51327933a720 Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 12:32:39 +0000
Subject: [PATCH 4/7] Correct URL

---
 base/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/requirements.txt b/base/requirements.txt
index d98b0b3..b849e5e 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,4 +1,4 @@
---extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/
+--extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/simple/
 
 apprise==1.2.1
 borgbackup==1.2.3

From a5e78e8d170bd02c50ed04e608711eb091422aea Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 12:33:23 +0000
Subject: [PATCH 5/7] update requirements.txt

---
 base/requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/requirements.txt b/base/requirements.txt
index b849e5e..9f89f6b 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,6 +1,6 @@
---extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/simple/
+--extra-index-url https://dl.cloudsmith.io/public/modem7/wheels/python/simple/
 
-apprise==1.2.1
+apprise==1.3.0
 borgbackup==1.2.3
-llfuse==1.4.2
 borgmatic==1.7.8
+llfuse==1.4.2

From 0738fc9d95339cc45d2528e36a530b416fb449e0 Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 12:33:43 +0000
Subject: [PATCH 6/7] fix url

---
 base/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/requirements.txt b/base/requirements.txt
index 9f89f6b..496b4af 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,4 +1,4 @@
---extra-index-url https://dl.cloudsmith.io/public/modem7/wheels/python/simple/
+--extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/simple/
 
 apprise==1.3.0
 borgbackup==1.2.3

From eb8bf21978017947872cacfb7ddb8e63f193f2bd Mon Sep 17 00:00:00 2001
From: Grant Bevis <20246437+grantbevis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 12:35:17 +0000
Subject: [PATCH 7/7] Remove libxxhash

---
 base/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 26aac6e..75613ad 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -17,7 +17,6 @@ RUN apk add --update --no-cache \
     findmnt \
     fuse \
     libacl \
-    libxxhash \
     logrotate \
     lz4-libs \
     mariadb-client \