From ee4fc31b9de3a75487472297715ad039b398817d Mon Sep 17 00:00:00 2001 From: David Culbreth Date: Fri, 20 Mar 2026 16:59:01 -0500 Subject: [PATCH] attempting more pipeline changes for local cluster registries --- .gitea/workflows/publish.yml | 20 ++++++++++++++++++-- Cargo.lock | 28 ++++++++++++++-------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 33fa376..8538bc1 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -227,11 +227,11 @@ jobs: shell: bash run: | set -euo pipefail + image_names_csv="" build_cmd=( docker buildx build "${{ matrix.image.context }}" --file "${{ matrix.image.dockerfile }}" - --push ) if [ -n "${{ matrix.image.target }}" ]; then @@ -239,13 +239,29 @@ jobs: fi while IFS= read -r tag; do - [ -n "$tag" ] && build_cmd+=(--tag "$tag") + if [ -n "$tag" ]; then + if [ -n "$image_names_csv" ]; then + image_names_csv="${image_names_csv},${tag}" + else + image_names_csv="${tag}" + fi + + if [ "${{ needs.metadata.outputs.registry_plain_http }}" != "true" ]; then + build_cmd+=(--tag "$tag") + fi + fi done <<< "${{ steps.tags.outputs.tags }}" while IFS= read -r build_arg; do [ -n "$build_arg" ] && build_cmd+=(--build-arg "$build_arg") done <<< "${{ matrix.image.build_args }}" + if [ "${{ needs.metadata.outputs.registry_plain_http }}" = "true" ]; then + build_cmd+=(--output "type=image,name=${image_names_csv},push=true,registry.insecure=true") + else + build_cmd+=(--push) + fi + "${build_cmd[@]}" publish-chart: diff --git a/Cargo.lock b/Cargo.lock index 464157f..4033316 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -212,7 +212,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1128,7 +1128,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1792,7 +1792,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1976,7 +1976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3361,7 +3361,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3493,7 +3493,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom 0.2.17", "http", @@ -4631,7 +4631,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4704,7 +4704,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4715,9 +4715,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.9" +version = "0.103.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" +checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" dependencies = [ "aws-lc-rs", "ring", @@ -5158,7 +5158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5520,7 +5520,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -6469,7 +6469,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]]