Merge branch 'antifascista' of ssh://gitea.nulo.in:420/Sutty/containers-skel into antifascista

https://github.com/woodpecker-ci/woodpecker/issues/4140#issuecomment-2369019247

.woodpecker.yml

@@ -1,23 +1,24 @@
-pipeline:
+steps:
   publish:
-    image: plugins/docker
+    image: "docker.io/woodpeckerci/plugin-docker-buildx"
     settings:
-      registry: registry.nulo.in
+      registry: "https://gitea.nulo.in"
-      username: sutty
+      username: "sutty"
-      repo: registry.nulo.in/sutty/borg
+      repo: "gitea.nulo.in/sutty/borg"
       tags:
-      - ${ALPINE_VERSION}
+      - "${ALPINE_VERSION}"
-      - latest
+      - "latest"
       build_args:
-      - ALPINE_VERSION=${ALPINE_VERSION}
+      - "ALPINE_VERSION=${ALPINE_VERSION}"
-      - BASE_IMAGE=registry.nulo.in/sutty/monit
+      - "BASE_IMAGE=gitea.nulo.in/sutty/monit"
-    secrets:
+      password:
-    - docker_password
+        from_secret: "DOCKER_PASSWORD"
     when:
-      branch: antifascista
+      branch: "antifascista"
-      event: push
+      event: "push"
 matrix:
-  ALPINE_VERSION:
+  include:
-  - 3.17.0
+  - ALPINE_VERSION: "3.20.3"
-  - 3.16.3
+  - ALPINE_VERSION: "3.19.4"
-  - 3.15.6
+  - ALPINE_VERSION: "3.18.9"
+  - ALPINE_VERSION: "3.17.10"

Dockerfile

@@ -1,7 +1,7 @@
-ARG ALPINE_VERSION=3.13.6
+ARG ALPINE_VERSION=3.18.3
-ARG BASE_IMAGE=sutty/monit
+ARG BASE_IMAGE=gitea.nulo.in/sutty/monit
 FROM ${BASE_IMAGE}:${ALPINE_VERSION}
-MAINTAINER "f <f@sutty.nl>"
+LABEL org.opencontainers.image.authors="f@sutty.nl"
 
 ENV BORG_HOST_ID borg
 ENV BORG_PASSPHRASE ""
@@ -11,7 +11,7 @@ ENV SSH_SERVER ""
 ENV SSH_USER root
 ENV SSH_PORT 22
 
-RUN apk add --no-cache borgbackup openssh-client
+RUN apk add --no-cache borgbackup openssh-client zulip-client
 
 COPY ./monit.conf /etc/monit.d/borg.conf
 COPY ./backup.sh /usr/local/bin/backup

backup.sh

@@ -1,19 +1,31 @@
 #!/bin/sh
-set -e
 
 # Password can't be empty
 test -n "${BORG_PASSPHRASE}"
 test -n "${DEST}"
 test -n "${SSH_ALIAS}"
 
+# Defaults
+SSH_PORT="${SSH_PORT:-22}"
+SSH_SERVER="${SSH_SERVER:-${SSH_ALIAS}}"
+SSH_USER="${SSH_USER:-root}"
+
+umask 077
+
 DATE="$(date +%F)"
 ORIG=/srv/data
 
 if ! grep -q "${SSH_ALIAS}" /root/.ssh/config ; then
-  echo "Host ${SSH_ALIAS}"                      >> /root/.ssh/config
+  echo "Host ${SSH_ALIAS}"        >> /root/.ssh/config
-  echo "  Port ${SSH_PORT:-22}"                 >> /root/.ssh/config
+  echo "  Port ${SSH_PORT}"       >> /root/.ssh/config
-  echo "  HostName ${SSH_SERVER:-${SSH_ALIAS}}" >> /root/.ssh/config
+  echo "  HostName ${SSH_SERVER}" >> /root/.ssh/config
-  echo "  User ${SSH_USER:-root}"               >> /root/.ssh/config
+  echo "  User ${SSH_USER}"       >> /root/.ssh/config
+fi
+
+touch /root/.ssh/known_hosts
+
+if ! ssh-keygen -F "[${SSH_SERVER}]:${SSH_PORT}"; then
+  echo "${SSH_KNOWN_HOSTS}" >> /root/.ssh/known_hosts
 fi
 
 ssh -fN ${SSH_ALIAS}
@@ -23,8 +35,13 @@ for signal in TERM QUIT HUP EXIT INT KILL; do
 done
 
 # It'll fail the second time
-borg init --encryption=repokey "${SSH_ALIAS}:${DEST}" || :
+borg init --encryption=repokey "${SSH_ALIAS}:${DEST}" 2>&1 | tee /tmp/backup.log
-borg create -v --stats "${SSH_ALIAS}:${DEST}::${DATE}" "${ORIG}"
+borg create -v --stats "${SSH_ALIAS}:${DEST}::${DATE}" "${ORIG}" 2>&1 | tee -a /tmp/backup.log
-borg prune -v --stats --keep-daily ${KEEP} "${SSH_ALIAS}:${DEST}"
+borg prune -v --stats --keep-daily ${KEEP} "${SSH_ALIAS}:${DEST}" 2>&1 | tee -a /tmp/backup.log
+borg list "${SSH_ALIAS}:${DEST}" 2>&1 | tee -a /tmp/backup.log
+
+if test -n "${ZULIP_KEY}"; then
+  cat /tmp/backup.log | zulip-client -u "${ZULIP_URL}" -b "${ZULIP_BOT}" -s "${ZULIP_STREAM}" -t "${ZULIP_TOPIC}"
+fi
 
 exit $?

ssh_config

@@ -5,3 +5,4 @@ Host *
   VerifyHostKeyDNS yes
   HashKnownHosts yes
   StrictHostKeyChecking ask
+  ForwardAgent yes