From 2dc1c249f4565d22d42c225b704ade8d933d364d Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 23 Dec 2022 20:12:24 +0100 Subject: [PATCH] Complete rename This commit completes the rename across all README, Dockerfiles and docker-compose.ymls. Signed-off-by: Felix Kaechele --- IMAGE_ARCHITECTURE.md | 8 ++++---- README.md | 8 ++++---- base/README.md | 6 +++--- base/docker-compose.yml | 2 +- msmtp/Dockerfile | 2 +- msmtp/docker-compose.yml | 2 +- ntfy/Dockerfile | 2 +- ntfy/docker-compose.yml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/IMAGE_ARCHITECTURE.md b/IMAGE_ARCHITECTURE.md index 26e3dd8..b3fc803 100644 --- a/IMAGE_ARCHITECTURE.md +++ b/IMAGE_ARCHITECTURE.md @@ -16,8 +16,8 @@ docker-borgmatic/ │ │ ├── crontab.txt # with mailto │ │ ├── mailenv.sh │ │ └── msmtprc.sh -│ ├── docker-compose.yml # image: b3vis/borgmatic:latest-msmtp, env: msmtp.env -│ ├── Dockerfile # FROM b3vis/borgmatic:${VERSION} +│ ├── docker-compose.yml # image: ghcr.io/borgmatic-collective/borgmatic:latest-msmtp, env: msmtp.env +│ ├── Dockerfile # FROM ghcr.io/borgmatic-collective/borgmatic:${VERSION} │ ├── entry.sh # starts msmtp in addition │ └── README.md # describes specifics only ├── ntfy @@ -25,8 +25,8 @@ docker-borgmatic/ │ │ └── borgmatic.d │ │ ├── config.yml # same as in base │ │ └── crontab.txt # same as in base -│ ├── docker-compose.yml # image: b3vis/borgmatic:latest-ntfy -│ ├── Dockerfile # FROM b3vis/borgmatic:${VERSION} +│ ├── docker-compose.yml # image: ghcr.io/borgmatic-collective/borgmatic:latest-ntfy +│ ├── Dockerfile # FROM ghcr.io/borgmatic-collective/borgmatic:${VERSION} │ ├── entry.sh # same as in base │ └── README.md # describes specifics only └── README.md diff --git a/README.md b/README.md index 216ced8..a94891c 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ ![](https://github.com/witten/borgmatic/raw/master/docs/static/borgmatic.png) -[![](https://img.shields.io/github/issues/b3vis/docker-borgmatic)](https://github.com/b3vis/docker-borgmatic/issues) -[![](https://img.shields.io/github/stars/b3vis/docker-borgmatic)](https://github.com/b3vis/docker-borgmatic/stargazers) -[![](https://img.shields.io/docker/stars/b3vis/borgmatic)](https://hub.docker.com/r/b3vis/borgmatic) -[![](https://img.shields.io/docker/pulls/b3vis/borgmatic)](https://hub.docker.com/r/b3vis/borgmatic) +[![](https://img.shields.io/github/issues/borgmatic-collective/docker-borgmatic)](https://github.com/borgmatic-collective/docker-borgmatic/issues) +[![](https://img.shields.io/github/stars/borgmatic-collective/docker-borgmatic)](https://github.com/borgmatic-collective/docker-borgmatic/stargazers) +[![](https://img.shields.io/docker/stars/borgmatic-collective/borgmatic)](https://hub.docker.com/r/borgmatic-collective/borgmatic) +[![](https://img.shields.io/docker/pulls/borgmatic-collective/borgmatic)](https://hub.docker.com/r/borgmatic-collective/borgmatic) ### Description diff --git a/base/README.md b/base/README.md index 8040834..12e8fe2 100644 --- a/base/README.md +++ b/base/README.md @@ -1,9 +1,9 @@ # Borgmatic Container -[![](https://images.microbadger.com/badges/image/b3vis/borgmatic.svg)](https://microbadger.com/images/b3vis/borgmatic +[![](https://images.microbadger.com/badges/image/borgmatic-collective/borgmatic.svg)](https://microbadger.com/images/borgmatic-collective/borgmatic "Get your own image badge on microbadger.com") +src="https://img.shields.io/docker/pulls/borgmatic-collective/borgmatic.svg" /> ### Description @@ -70,7 +70,7 @@ docker run \ -v /opt/docker/docker-borgmatic/data/.ssh:/root/.ssh \ -v /opt/docker/docker-borgmatic/data/.cache/borg:/root/.cache/borg \ -e TZ=Europe/Berlin \ - b3vis/borgmatic + ghcr.io/borgmatic-collective/borgmatic ``` While the parameters above are sufficient for regular backups, following additional privileges will be needed to mount an archive as FUSE filesystem: diff --git a/base/docker-compose.yml b/base/docker-compose.yml index 79057dc..df598a3 100644 --- a/base/docker-compose.yml +++ b/base/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: borgmatic: - image: b3vis/borgmatic + image: ghcr.io/borgmatic-collective/borgmatic container_name: borgmatic volumes: - ${VOLUME_SOURCE}:/mnt/source:ro # backup source diff --git a/msmtp/Dockerfile b/msmtp/Dockerfile index 4b04bed..e8d2ce5 100644 --- a/msmtp/Dockerfile +++ b/msmtp/Dockerfile @@ -1,4 +1,4 @@ -FROM b3vis/borgmatic:latest +FROM ghcr.io/borgmatic-collective/borgmatic:latest LABEL mainainer='b3vis' COPY entry.sh /entry.sh COPY data/scripts /scripts diff --git a/msmtp/docker-compose.yml b/msmtp/docker-compose.yml index b83f3b1..006f979 100644 --- a/msmtp/docker-compose.yml +++ b/msmtp/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: borgmatic: - image: b3vis/borgmatic:msmtp + image: ghcr.io/borgmatic-collective/borgmatic:msmtp container_name: borgmatic volumes: - ${VOLUME_SOURCE}:/mnt/source:ro # backup source diff --git a/ntfy/Dockerfile b/ntfy/Dockerfile index 7a1e6d9..b7dfd81 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:latest +FROM ghcr.io/borgmatic-collective/borgmatic:latest LABEL mainainer='b3vis' VOLUME /root/.config/ntfy COPY --from=builder /usr/lib/python3.9/site-packages /usr/lib/python3.9/ diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml index aead209..971976b 100644 --- a/ntfy/docker-compose.yml +++ b/ntfy/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: borgmatic: - image: b3vis/borgmatic:ntfy + image: ghcr.io/borgmatic-collective/borgmatic:ntfy container_name: borgmatic volumes: - ${VOLUME_SOURCE}:/mnt/source:ro # backup source