Merge branch 'nix'

.webhook_bridge/pipeline-build-homepage-staging.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   timeouts:
     pipeline: "2h0m0s"
-    tasks: "1h0m40s"
+    tasks: "1h0m0s"
     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: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
@@ -123,43 +123,37 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
-              value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml
+              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
           - name: OUTPUT
             value: >-
-              $(params.image-name):$(tasks.get-time.results.unix-time)
+              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--target"
+              - "--opt"
-              - "$(params.target-name)"
+              - "target=$(params.target-name)"
-              - --cache-from
+              - --import-cache
-              - "$(params.image-name)-buildcache"
+              - "type=registry,ref=$(params.image-name):buildcache"
-              - --cache-to
+              - --export-cache
-              - "$(params.image-name)-buildcache"
+              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
-              - --build-arg
+              - --opt
-              - "SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)"
+              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-              - --build-arg
+              - --opt
-              - "NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org"
+              - "build-arg:NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org"
-          - name: REGISTRIES_CONF
+          - name: BUILDKITD_TOML
             value: |
-              unqualified-search-registries = ["docker.io"]
+              debug = true
-
+              [registry."docker.io"]
-              [[registry]]
+                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              location = "dockerhub.dockerhub.svc.cluster.local"
+              [registry."dockerhub.dockerhub.svc.cluster.local"]
-              insecure = true
+                http = true
-
+                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
@@ -179,7 +173,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
@@ -208,7 +202,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
@@ -251,4 +245,4 @@ spec:
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile
-      value: docker/server/Dockerfile
+      value: docker/server

.webhook_bridge/pipeline-build-homepage.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   timeouts:
     pipeline: "2h0m0s"
-    tasks: "1h0m40s"
+    tasks: "1h0m0s"
     finally: "0h30m0s"
   taskRunTemplate:
     serviceAccountName: build-bot
@@ -70,7 +70,6 @@ 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
@@ -91,9 +90,11 @@ spec:
             - name: url
               value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
+        runAfter:
+          - fetch-repository
         params:
           - name: CONTEXT
             value: "$(params.JOB_NAME)"
@@ -109,9 +110,19 @@ 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)
@@ -119,18 +130,6 @@ 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
@@ -138,43 +137,37 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
-              value: task/buildah-rootless-daemonless/0.1/buildah-rootless-daemonless.yaml
+              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
           - name: OUTPUT
             value: >-
-              $(params.image-name):$(tasks.detect-tag.results.tag)
+              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--target"
+              - "--opt"
-              - "$(params.target-name)"
+              - "target=$(params.target-name)"
-              - --cache-from
+              - --import-cache
-              - "$(params.image-name)-buildcache"
+              - "type=registry,ref=$(params.image-name):buildcache"
-              - --cache-to
+              - --export-cache
-              - "$(params.image-name)-buildcache"
+              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
-              - --build-arg
+              - --opt
-              - "SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)"
+              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-              - --build-arg
+              - --opt
-              - "NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org"
+              - "build-arg:NIX_SUBSTITUTERS=http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org"
-          - name: REGISTRIES_CONF
+          - name: BUILDKITD_TOML
             value: |
-              unqualified-search-registries = ["docker.io"]
+              debug = true
-
+              [registry."docker.io"]
-              [[registry]]
+                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              location = "dockerhub.dockerhub.svc.cluster.local"
+              [registry."dockerhub.dockerhub.svc.cluster.local"]
-              insecure = true
+                http = true
-
+                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
@@ -194,7 +187,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
@@ -223,7 +216,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: df36b3853a5657fd883015cdbf07ad6466918acf
+              value: f914437a46978b95f325f68d791dcf1a35738f60
             - name: pathInRepo
               value: task/gitea-set-status/0.1/gitea-set-status.yaml
         params:
@@ -266,4 +259,4 @@ spec:
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile
-      value: docker/server/Dockerfile
+      value: docker/server

pages/about_me/index.org

@@ -7,7 +7,7 @@
 #+exclude_tags: noexport
 
 Links:
-- My personal repos: [[https://code.fizz.buzz/talexander][code.fizz.buzz]]
+- My personal repos: [[https://code.fizz.buzz/explore/repos][code.fizz.buzz]]
 - LinkedIn: https://www.linkedin.com/in/tom-alexander-b6a18216/
 - GitHub: https://github.com/tomalexander
 - Resume: https://fizz.buzz/tom_alexander_resume.pdf