Compare commits

...

3 commits

Author SHA1 Message Date
Andreas Mieke 6035ca549e Merge branch 'release/1.0.0'
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-13 03:20:38 +01:00
Andreas Mieke 397f800372 fix(platforms): Remove useless platforms
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-13 03:17:42 +01:00
Andreas Mieke 49b78cf10f feat(platforms): Add ARM support
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-01-13 03:14:36 +01:00
4 changed files with 41 additions and 40 deletions

View file

@ -1,30 +1,39 @@
--- steps:
variables:
- &kaniko_plugin 'plugins/kaniko:1.6'
matrix:
include:
- BASE: bookworm-slim
TAGS: '[ "bookwork", "1.2", "1.2.2" ]'
- BASE: bullseye-slim
TAGS: '[ "bullseye", "latest", "1.1.16" ]'
- BASE: buster-slim
TAGS: '[ "buster", "1.1.9" ]'
pipeline:
build: build:
image: *kaniko_plugin image: woodpeckerci/plugin-docker-buildx
group: build
settings: settings:
repo: nold360/borgserver dry-run: true
dockerfile: Dockerfile repo: git.merp.digital/${CI_REPO_OWNER}/borgserver
build_args: platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
- BASE_IMAGE=debian:${BASE} registry: git.merp.digital
tags: ${TAGS}
username:
from_secret: docker_username
password:
from_secret: docker_password
when: when:
- branch: master - event: push
- event: cron branch:
exclude: [develop, master]
publish-nightly:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.merp.digital/${CI_REPO_OWNER}/borgserver
platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
registry: git.merp.digital
tags: develop-${CI_COMMIT_SHA}
username: ${CI_REPO_OWNER}
password:
from_secret: cb_token
when:
- event: push
branch: develop
publish-release:
image: woodpeckerci/plugin-docker-buildx
settings:
repo: git.merp.digital/${CI_REPO_OWNER}/borgserver
platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8
registry: git.merp.digital
tags: ${CI_COMMIT_TAG}
username: ${CI_REPO_OWNER}
password:
from_secret: cb_token
when:
- event: tag

View file

@ -2,8 +2,7 @@
# Dockerfile to build borgbackup server images # Dockerfile to build borgbackup server images
# Based on Debian # Based on Debian
############################################################ ############################################################
ARG BASE_IMAGE=debian:bullseye-slim FROM debian:12.4-slim
FROM $BASE_IMAGE
# Volume for SSH-Keys # Volume for SSH-Keys
VOLUME /sshkeys VOLUME /sshkeys

View file

@ -29,7 +29,7 @@ docker run -td \
-p 2222:22 \ -p 2222:22 \
--volume ./borg/sshkeys:/sshkeys \ --volume ./borg/sshkeys:/sshkeys \
--volume ./borg/backup:/backup \ --volume ./borg/backup:/backup \
nold360/borgserver:latest git.merp.digital/eranmorkon/borgserver:1.0.0
``` ```
@ -45,7 +45,7 @@ See the the documentation for all available arguments: [borgbackup.readthedocs.i
##### Example ##### Example
``` ```
docker run --rm -e BORG_SERVE_ARGS="--progress --debug" (...) nold360/borgserver docker run --rm -e BORG_SERVE_ARGS="--progress --debug" (...) git.merp.digital/eranmorkon/borgserver
``` ```
#### BORG_APPEND_ONLY #### BORG_APPEND_ONLY
@ -62,7 +62,7 @@ To declare a client as admin, set this variable to the name of the client/sshkey
##### Example ##### Example
``` ```
docker run --rm -e BORG_APPEND_ONLY="yes" -e BORG_ADMIN="nolds_notebook" (...) nold360/borgserver docker run --rm -e BORG_APPEND_ONLY="yes" -e BORG_ADMIN="nolds_notebook" (...) git.merp.digital/eranmorkon/borgserver
``` ```
To prune repos from another client, you have to add the path to the repository in the clients directory: To prune repos from another client, you have to add the path to the repository in the clients directory:
@ -132,10 +132,3 @@ And create your first backup!
``` ```
$ borg create backup:my_first_borg_repo::documents-2017-11-01 /home/user/MyImportentDocs $ borg create backup:my_first_borg_repo::documents-2017-11-01 /home/user/MyImportentDocs
``` ```
## Tags
All images are freshly built every week & published as `nold360/borgserver` with the following tags:
- Next / Unstable [borg 1.2.0]: `bookworm`, `1.2.0`
- Latest / Stable [borg 1.1.16]: `bullseye`, `1.1.16`, `latest`
- Legacy / Buster [borg 1.1.9 ]: `buster`, `1.1.9`

View file

@ -1,7 +1,7 @@
version: '3' version: '3'
services: services:
borgserver: borgserver:
image: nold360/borgserver image: git.merp.digital/eranmorkon/borgserver
#build: . #build: .
volumes: volumes:
- ./backup:/backup - ./backup:/backup