Compare commits

..

7 Commits

Author SHA1 Message Date
4a3c7bff5e
Change zot username
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-09-20 06:55:11 +02:00
c3aa829a17
Build AMD only
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-09-20 06:48:36 +02:00
d52006f8e8
Update scripts to use zot
All checks were successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
2024-09-20 06:36:27 +02:00
c240c28dfa
Fix CI
All checks were successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
2024-09-20 06:26:47 +02:00
d5491ae2a7
Fix CI 2024-09-20 06:26:17 +02:00
81b3e435a3
Trigger build 2024-09-20 06:25:40 +02:00
0e1ff2e22e
Push builder to zot 2024-09-20 06:24:52 +02:00
5 changed files with 14 additions and 17 deletions

View File

@ -5,8 +5,8 @@ when:
matrix:
include:
- NAME: ARM
ARCH: arm64
# - NAME: ARM
# ARCH: arm64
- NAME: AMD
ARCH: amd64
@ -15,11 +15,11 @@ steps:
image: alpine
privileged: true
environment:
BUILDAH_REG: gitea.badhouseplants.net/badhouseplants/badhouseplants-builder
BUILDAH_REG: zot.badhouseplants.net/badhouseplants/badhouseplants-builder
commands:
- ./build
secrets:
- gitea_token
- registry_token
backend_options:
kubernetes:
resources:
@ -34,10 +34,10 @@ steps:
nodeSelector:
kubernetes.io/arch: "${ARCH}"
cleanup:
image: gitea.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
image: zot.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
secrets:
- gitea_token
- registry_token
environment:
BUILDAH_REG: gitea.badhouseplants.net/badhouseplants/badhouseplants-builder
BUILDAH_REG: zot.badhouseplants.net/badhouseplants/badhouseplants-builder
commands:
- cleanup

2
build
View File

@ -25,7 +25,7 @@ echo "24.07.2024"
apk update
apk add buildah cni-plugins iptables ip6tables fuse-overlayfs netavark
buildah login -u allanger -p $GITEA_TOKEN gitea.badhouseplants.net
buildah login -u woody -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

View File

@ -1,3 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
}

View File

@ -35,12 +35,12 @@ 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'} || 'git.badhouseplants.net';
my $container_registry = $ENV{'CONTAINER_REGISTRY'} || 'zot.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'} || "";
my $username = $ENV{'DRONE_USERNAME'} || "allanger";
my $password = $ENV{'GITEA_TOKEN'} || "YOU NOT AUTHORIZED, PAL";
my $username = "woody";
my $password = $ENV{'REGISTRY_TOKEN'} || "YOU NOT AUTHORIZED, PAL";
my $containerfile = $ENV{'CONTAINERFILE'} || "Containerfile";
my $args = $ENV{'BUILD_ARGS'};
0 == system ("buildah login --username $username --password $password $container_registry") or die $!;

View File

@ -25,12 +25,12 @@ use warnings;
# --------------------------------------
# -- Gitea variables
# --------------------------------------
my $gitea_url=$ENV{'GITEA_URL'} || 'https://git.badhouseplants.net/api/v1';
my $gitea_url=$ENV{'GITEA_URL'} || 'https://zot.badhouseplants.net/api/v1';
my $gitea_org=$ENV{'DRONE_REPO_NAMESPACE'} || 'badhouseplants';
my $gitea_package=$ENV{'DRONE_REPO_NAME'} || 'badhouseplants-net';
my $gitea_api="$gitea_url/packages/$gitea_org/container/$gitea_package";
my $gitea_list_api="$gitea_url/packages/$gitea_org?page=1&type=container&q=$gitea_package";
my $gitea_token=$ENV{'GITEA_TOKEN'};
my $gitea_token=$ENV{'REGISTRY_TOKEN'};
my $gitea_user=$ENV{'GITEA_USER'} || $ENV{'DRONE_COMMIT_AUTHOR'};
# ---------------------------------------
# -- Get tags from Gitea
@ -85,4 +85,4 @@ if (defined $ENV{CLEANUP_MINIO}) {
print "$output \n";
}
}
}
}