From 2caa791be24e567fa6e225039f2f3168a59d628d Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Nov 2025 13:30:53 +0100 Subject: [PATCH] Try pushing to gitea Signed-off-by: Nikolai Rodionov --- .woodpecker.yaml | 3 ++- build | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker.yaml b/.woodpecker.yaml index de4f76f..57aa5d0 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -17,7 +17,8 @@ steps: environment: BUILDAH_REG: gitea.badhouseplants.net/badhouseplants/container-builder REGISTRY_TOKEN: - from_secret: registry_token + from_secret: GITEA_REGISTRY_TOKEN + REGISTRY_USER: devops-bot commands: - env - ./build diff --git a/build b/build index e20381d..0b46f70 100755 --- a/build +++ b/build @@ -21,19 +21,18 @@ # --------------------------------------------------------------------------- #! /bin/sh -echo "28.03.2025" +echo "28.11.2025" apk update apk add buildah cni-plugins iptables ip6tables fuse-overlayfs netavark -buildah login -u woody -p $REGISTRY_TOKEN zot.badhouseplants.net +buildah login -u $REGISTRY_USER -p $REGISTRY_TOKEN zot.badhouseplants.net buildah build -t $BUILDAH_REG:$CI_COMMIT_SHA . -buildah tag $BUILDAH_REG:$CI_COMMIT_SHA $BUILDAH_REG:latest if [ -z ${BUILD_DEBUG+x} ]; then - buildah push $BUILDAH_REG:$CI_COMMIT_SHA; - buildah push $BUILDAH_REG:latest; + buildah push $BUILDAH_REG:$CI_COMMIT_SHA; fi -if [ "${CI_REPO_DEFAULT_BRANCH}"="${CI_COMMIT_BRANCH}" ]; then - buildah push $BUILDAH_REG:latest +if [ ${CI_COMMIT_BRANCH} = ${CI_REPO_DEFAULT_BRANCH} ]; then + buildah tag $BUILDAH_REG:$CI_COMMIT_SHA $BUILDAH_REG:latest + buildah push $BUILDAH_REG:latest; fi