diff --git a/base/Dockerfile b/base/Dockerfile index b98183d..75613ad 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,11 +1,6 @@ # 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 -LABEL maintainer='b3vis' +FROM python:3.11.2-alpine3.17 +LABEL maintainer='github.com/borgmatic-collective' VOLUME /mnt/source VOLUME /mnt/borg-repository VOLUME /root/.borgmatic @@ -14,28 +9,28 @@ 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 \ 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..496b4af 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,6 +1,6 @@ ---extra-index-url https://borgmatic-collective.github.io/pypi/simple +--extra-index-url https://dl.cloudsmith.io/public/borgmatic-collective/borgmatic/python/simple/ -apprise==1.2.1 +apprise==1.3.0 borgbackup==1.2.3 +borgmatic==1.7.8 llfuse==1.4.2 -borgmatic==1.7.7