From 0dca91f574b67a8ae4c41c820d2a229b1111799c Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Nov 2025 13:17:40 +0100 Subject: [PATCH 1/4] Check the env Signed-off-by: Nikolai Rodionov --- .woodpecker.yaml | 3 ++- Containerfile | 13 +------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 4c65c2f..de4f76f 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -15,10 +15,11 @@ steps: image: alpine privileged: true environment: - BUILDAH_REG: zot.badhouseplants.net/badhouseplants/badhouseplants-builder + BUILDAH_REG: gitea.badhouseplants.net/badhouseplants/container-builder REGISTRY_TOKEN: from_secret: registry_token commands: + - env - ./build backend_options: kubernetes: diff --git a/Containerfile b/Containerfile index 1b723b6..294416d 100644 --- a/Containerfile +++ b/Containerfile @@ -1,16 +1,5 @@ -FROM registry.hub.docker.com/rclone/rclone AS rclone -WORKDIR /out -RUN cp $(which rclone) /out/rclone - -FROM registry.hub.docker.com/argoproj/argocd as argocd -WORKDIR /out -RUN cp $(which argocd) /out/argocd - - FROM registry.hub.docker.com/library/alpine -RUN apk update --no-cache&&\ +RUN apk update --no-cache &&\ apk add yq gettext openssl curl jq perl git git-lfs netavark\ buildah cni-plugins iptables ip6tables fuse-overlayfs --no-cache -COPY --from=rclone /out/rclone /usr/bin/rclone -COPY --from=argocd /out/argocd /usr/bin/argocd COPY ./scripts/ /usr/bin/ -- 2.49.1 From 2caa791be24e567fa6e225039f2f3168a59d628d Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Nov 2025 13:30:53 +0100 Subject: [PATCH 2/4] 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 -- 2.49.1 From e408fe8c99c6c42a7bdc357314dbda9115197e09 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Nov 2025 13:35:45 +0100 Subject: [PATCH 3/4] Try pushing to gitea Signed-off-by: Nikolai Rodionov --- .woodpecker.yaml | 1 - scripts/build-container | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 57aa5d0..6aba927 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -20,7 +20,6 @@ steps: from_secret: GITEA_REGISTRY_TOKEN REGISTRY_USER: devops-bot commands: - - env - ./build backend_options: kubernetes: diff --git a/scripts/build-container b/scripts/build-container index c3f1045..2e8c853 100755 --- a/scripts/build-container +++ b/scripts/build-container @@ -35,7 +35,7 @@ chomp($git_commit_sha); # -- Build the image with SHA tag # -- my main build system is DRONE, so I'm using DRONE variables a lot # --------------------------------------------------------------------------- -my $container_registry = $ENV{'CONTAINER_REGISTRY'} || 'zot.badhouseplants.net'; +my $container_registry = $ENV{'CONTAINER_REGISTRY'} || 'gitea.badhouseplants.net'; my $image_name = $ENV{'PACKAGE_NAME'} | $ENV{'DRONE_REPO'} || "badhouseplants/badhouseplants-net"; my $tag = "$container_registry/$image_name:$git_commit_sha"; my $custom_tag = $ENV{'CUSTOM_TAG'} || ""; -- 2.49.1 From 9dcba526aa66c1b54305adc5a6af46747f1c7221 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 26 Nov 2025 13:36:53 +0100 Subject: [PATCH 4/4] Try pushing to gitea Signed-off-by: Nikolai Rodionov --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index 0b46f70..ee50a4c 100755 --- a/build +++ b/build @@ -25,7 +25,7 @@ echo "28.11.2025" apk update apk add buildah cni-plugins iptables ip6tables fuse-overlayfs netavark -buildah login -u $REGISTRY_USER -p $REGISTRY_TOKEN zot.badhouseplants.net +buildah login -u $REGISTRY_USER -p $REGISTRY_TOKEN gitea.badhouseplants.net buildah build -t $BUILDAH_REG:$CI_COMMIT_SHA . if [ -z ${BUILD_DEBUG+x} ]; then -- 2.49.1