From c78893bdd8a9b74934805b5554cc84a46f0b89d2 Mon Sep 17 00:00:00 2001 From: Benjamin Bock Date: Mon, 14 Jun 2021 20:43:39 +0200 Subject: [PATCH 1/2] fix maintainer labels --- msmtp/Dockerfile | 2 +- ntfy/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/msmtp/Dockerfile b/msmtp/Dockerfile index 74a57cd..4808a4d 100644 --- a/msmtp/Dockerfile +++ b/msmtp/Dockerfile @@ -1,5 +1,5 @@ FROM b3vis/borgmatic:v1.1.15-1.5.12 -MAINTAINER b3vis +LABEL mainainer='b3vis' COPY entry.sh /entry.sh RUN apk upgrade --no-cache \ && apk add --no-cache \ diff --git a/ntfy/Dockerfile b/ntfy/Dockerfile index 410f740..5fb6545 100644 --- a/ntfy/Dockerfile +++ b/ntfy/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:latest as builder -MAINTAINER b3vis +LABEL mainainer='b3vis' RUN apk upgrade --no-cache \ && apk add --no-cache \ alpine-sdk \ @@ -11,7 +11,7 @@ RUN apk upgrade --no-cache \ && pip3 install --upgrade ntfy[pid,emoji,xmpp,telegram,instapush,slack,rocketchat] FROM b3vis/borgmatic:v1.1.15-1.5.12 -MAINTAINER b3vis +LABEL mainainer='b3vis' VOLUME /root/.config/ntfy COPY --from=builder /usr/lib/python3.8/site-packages /usr/lib/python3.8/ COPY --from=builder /usr/bin/ntfy /usr/bin/ From 9adc1fee1d60b4f8e946433b5d17fa701927f5fe Mon Sep 17 00:00:00 2001 From: Benjamin Bock Date: Mon, 14 Jun 2021 20:44:56 +0200 Subject: [PATCH 2/2] upgrade borg and borgmatic to latest versions --- base/Dockerfile | 4 ++-- msmtp/Dockerfile | 2 +- ntfy/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 579f951..23043d5 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest as builder LABEL mainainer='b3vis' -ARG BORG_VERSION=1.1.15 -ARG BORGMATIC_VERSION=1.5.12 +ARG BORG_VERSION=1.1.16 +ARG BORGMATIC_VERSION=1.5.14 ARG LLFUSE_VERSION=1.3.6 RUN apk upgrade --no-cache \ && apk add --no-cache \ diff --git a/msmtp/Dockerfile b/msmtp/Dockerfile index 4808a4d..253245b 100644 --- a/msmtp/Dockerfile +++ b/msmtp/Dockerfile @@ -1,4 +1,4 @@ -FROM b3vis/borgmatic:v1.1.15-1.5.12 +FROM b3vis/borgmatic:v1.1.16-1.5.14 LABEL mainainer='b3vis' COPY entry.sh /entry.sh RUN apk upgrade --no-cache \ diff --git a/ntfy/Dockerfile b/ntfy/Dockerfile index 5fb6545..a4ac4e2 100644 --- a/ntfy/Dockerfile +++ b/ntfy/Dockerfile @@ -10,7 +10,7 @@ RUN apk upgrade --no-cache \ && pip3 install --upgrade pip \ && pip3 install --upgrade ntfy[pid,emoji,xmpp,telegram,instapush,slack,rocketchat] -FROM b3vis/borgmatic:v1.1.15-1.5.12 +FROM b3vis/borgmatic:v1.1.16-1.5.14 LABEL mainainer='b3vis' VOLUME /root/.config/ntfy COPY --from=builder /usr/lib/python3.8/site-packages /usr/lib/python3.8/