From 95c149cf5b30270d531d728b3652384b65a69df8 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 19 Oct 2026 17:01:29 -0400 Subject: [PATCH 1/2] Switch staging build of homepage to buildah. --- .../pipeline-build-homepage-staging.yaml | 56 ++++++++++--------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/.webhook_bridge/pipeline-build-homepage-staging.yaml b/.webhook_bridge/pipeline-build-homepage-staging.yaml index 51ff1e7..c62838a 100644 --- a/.webhook_bridge/pipeline-build-homepage-staging.yaml +++ b/.webhook_bridge/pipeline-build-homepage-staging.yaml @@ -7,7 +7,7 @@ metadata: spec: timeouts: pipeline: "2h0m0s" - tasks: "1h0m0s" + tasks: "1h0m40s" finally: "0h30m0s" taskRunTemplate: serviceAccountName: build-bot @@ -53,7 +53,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -123,37 +123,43 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.get-time.results.unix-time)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.get-time.results.unix-time) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - --opt - - "build-arg:NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org" - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - --build-arg + - "SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)" + - --build-arg + - "NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -173,7 +179,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -202,7 +208,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -245,4 +251,4 @@ spec: - name: path-to-image-context value: . - name: path-to-dockerfile - value: docker/server + value: docker/server/Dockerfile From 1d85d907ac9299b7df858a70164b75fefa3566fa Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Tue, 20 Oct 2026 22:43:32 -0400 Subject: [PATCH 2/2] Switch main build of homepage to buildah. --- .webhook_bridge/pipeline-build-homepage.yaml | 85 +++++++++++--------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/.webhook_bridge/pipeline-build-homepage.yaml b/.webhook_bridge/pipeline-build-homepage.yaml index 030d90f..acc32ae 100644 --- a/.webhook_bridge/pipeline-build-homepage.yaml +++ b/.webhook_bridge/pipeline-build-homepage.yaml @@ -7,7 +7,7 @@ metadata: spec: timeouts: pipeline: "2h0m0s" - tasks: "1h0m0s" + tasks: "1h0m40s" finally: "0h30m0s" taskRunTemplate: serviceAccountName: build-bot @@ -70,6 +70,7 @@ spec: script: | #!/usr/bin/env sh set -euo pipefail + export GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=accept-new" git fetch --tags current_tag=$(git tag --points-at HEAD --list 'v*.*.*') if [ -z "$current_tag" ]; then @@ -90,11 +91,9 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml - runAfter: - - fetch-repository params: - name: CONTEXT value: "$(params.JOB_NAME)" @@ -110,19 +109,9 @@ spec: value: pending - name: TARGET_URL value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)" + runAfter: + - fetch-repository - name: fetch-repository - taskRef: - resolver: git - params: - - name: url - value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 - - name: pathInRepo - value: task/git-clone/0.9/git-clone.yaml - workspaces: - - name: output - workspace: git-source params: - name: url value: $(params.REPO_URL) @@ -130,6 +119,18 @@ spec: value: $(params.PULL_BASE_SHA) - name: deleteExisting value: "true" + taskRef: + params: + - name: url + value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git + - name: revision + value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1" + - name: pathInRepo + value: task/git-clone/0.1/git-clone.yaml + resolver: git + workspaces: + - name: output + workspace: git-source - name: build-image taskRef: resolver: git @@ -137,37 +138,43 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 + value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60 - name: pathInRepo - value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml + value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml params: - name: OUTPUT value: >- - type=image,"name=$(params.image-name):latest,$(params.image-name):$(tasks.detect-tag.results.tag)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true + $(params.image-name):$(tasks.detect-tag.results.tag) - name: CONTEXT value: $(params.path-to-image-context) - name: DOCKERFILE value: $(params.path-to-dockerfile) - name: EXTRA_ARGS value: - - "--opt" - - "target=$(params.target-name)" - - --import-cache - - "type=registry,ref=$(params.image-name):buildcache" - - --export-cache - - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - - --opt - - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) - - --opt - - "build-arg:NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org" - - name: BUILDKITD_TOML + - "--target" + - "$(params.target-name)" + - --cache-from + - "$(params.image-name)-buildcache" + - --cache-to + - "$(params.image-name)-buildcache" + - --build-arg + - "SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)" + - --build-arg + - "NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org" + - name: REGISTRIES_CONF value: | - debug = true - [registry."docker.io"] - mirrors = ["dockerhub.dockerhub.svc.cluster.local"] - [registry."dockerhub.dockerhub.svc.cluster.local"] - http = true - insecure = true + unqualified-search-registries = ["docker.io"] + + [[registry]] + location = "dockerhub.dockerhub.svc.cluster.local" + insecure = true + + [[registry]] + location = "docker.io" + + [[registry.mirror]] + location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL + insecure = true workspaces: - name: source workspace: git-source @@ -187,7 +194,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -216,7 +223,7 @@ spec: - name: url value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git - name: revision - value: f914437a46978b95f325f68d791dcf1a35738f60 + value: df36b3853a5657fd883015cdbf07ad6466918acf - name: pathInRepo value: task/gitea-set-status/0.1/gitea-set-status.yaml params: @@ -259,4 +266,4 @@ spec: - name: path-to-image-context value: . - name: path-to-dockerfile - value: docker/server + value: docker/server/Dockerfile