Merge branch 'buildah'

.webhook_bridge/pipeline-build-hash.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   timeouts:
     pipeline: "2h0m0s"
-    tasks: "1h0m0s"
+    tasks: "1h0m40s"
     finally: "0h30m0s"
   taskRunTemplate:
     serviceAccountName: build-bot
@@ -103,35 +103,39 @@ 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.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
+              $(params.image-name):$(tasks.fetch-repository.results.commit)
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target"
-              - "target=$(params.target-name)"
+              - "$(params.target-name)"
-              - --import-cache
+              - --cache-from
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - "$(params.image-name)-buildcache"
-              - --export-cache
+              - --cache-to
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - "$(params.image-name)-buildcache"
-              - --opt
+          - name: REGISTRIES_CONF
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-          - name: BUILDKITD_TOML
             value: |
-              debug = true
+              unqualified-search-registries = ["docker.io"]
-              [registry."docker.io"]
+
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
+              [[registry]]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
+              location = "dockerhub.dockerhub.svc.cluster.local"
-                http = true
+              insecure = 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
@@ -153,7 +157,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -182,7 +186,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-tracing
         taskSpec:
@@ -197,7 +201,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -226,7 +230,7 @@ spec:
           - run-image-none
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-compare
         taskSpec:
@@ -241,7 +245,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -270,7 +274,7 @@ spec:
           - run-image-tracing
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-default
         taskSpec:
@@ -285,7 +289,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -314,7 +318,7 @@ spec:
           - run-image-compare
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-tracing-compare
         taskSpec:
@@ -329,7 +333,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -358,7 +362,7 @@ spec:
           - run-image-default
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-compare-foreign
         taskSpec:
@@ -373,7 +377,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -407,7 +411,7 @@ spec:
           - run-image-tracing-compare
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-all
         taskSpec:
@@ -422,7 +426,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -456,7 +460,7 @@ spec:
           - run-image-compare-foreign
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-wasm
         taskSpec:
@@ -471,7 +475,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -511,7 +515,7 @@ spec:
           - run-image-all
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       #############
       - name: run-image-wasm-test
         taskSpec:
@@ -526,7 +530,7 @@ spec:
             computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -562,8 +566,7 @@ spec:
           - run-image-wasm
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
-      #############
     finally:
       - name: report-success
         when:
@@ -660,20 +663,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
-        # matrix:
-        #   params:
-        #     - name: cache-subdir
-        #       value:
-        #         - none
-        #         - tracing
-        #         - compare
-        #         - default
-        #         - tracing-compare
-        #         - compare-foreign
-        #         - all
-        #         - wasm
-        #         - wasm-test
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -703,4 +693,4 @@ spec:
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile
-      value: docker/organic_development/
+      value: docker/organic_development/Dockerfile

.webhook_bridge/pipeline-foreign-document-test.yaml

@@ -103,35 +103,39 @@ 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.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
+              $(params.image-name):$(tasks.fetch-repository.results.commit)
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target"
-              - "target=$(params.target-name)"
+              - "$(params.target-name)"
-              - --import-cache
+              - --cache-from
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - "$(params.image-name)-buildcache"
-              - --export-cache
+              - --cache-to
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - "$(params.image-name)-buildcache"
-              - --opt
+          - name: REGISTRIES_CONF
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-          - name: BUILDKITD_TOML
             value: |
-              debug = true
+              unqualified-search-registries = ["docker.io"]
-              [registry."docker.io"]
+
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
+              [[registry]]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
+              location = "dockerhub.dockerhub.svc.cluster.local"
-                http = true
+              insecure = 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
@@ -178,7 +182,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     finally:
       - name: report-success
         when:
@@ -275,7 +279,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -305,4 +309,4 @@ spec:
     - name: path-to-image-context
       value: docker/organic_test/
     - name: path-to-dockerfile
-      value: docker/organic_test/
+      value: docker/organic_test/Dockerfile

.webhook_bridge/pipeline-format.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   timeouts:
     pipeline: "2h0m0s"
-    tasks: "1h0m0s"
+    tasks: "1h0m40s"
     finally: "0h30m0s"
   taskRunTemplate:
     serviceAccountName: build-bot
@@ -103,35 +103,39 @@ 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.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
+              $(params.image-name):$(tasks.fetch-repository.results.commit)
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target"
-              - "target=$(params.target-name)"
+              - "$(params.target-name)"
-              - --import-cache
+              - --cache-from
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - "$(params.image-name)-buildcache"
-              - --export-cache
+              - --cache-to
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - "$(params.image-name)-buildcache"
-              - --opt
+          - name: REGISTRIES_CONF
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-          - name: BUILDKITD_TOML
             value: |
-              debug = true
+              unqualified-search-registries = ["docker.io"]
-              [registry."docker.io"]
+
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
+              [[registry]]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
+              location = "dockerhub.dockerhub.svc.cluster.local"
-                http = true
+              insecure = 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
@@ -180,7 +184,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
       - name: commit-changes
         taskRef:
           resolver: git
@@ -308,7 +312,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -338,4 +342,4 @@ spec:
     - name: path-to-image-context
       value: docker/organic_development/
     - name: path-to-dockerfile
-      value: docker/organic_development/
+      value: docker/organic_development/Dockerfile

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -5,12 +5,12 @@ metadata:
   labels:
     pdb: protect
 spec:
-  taskRunTemplate:
-    serviceAccountName: build-bot
   timeouts:
     pipeline: "2h0m0s"
     tasks: "1h0m40s"
     finally: "0h30m0s"
+  taskRunTemplate:
+    serviceAccountName: build-bot
   pipelineSpec:
     params:
       - name: image-name
@@ -103,35 +103,39 @@ 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.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
+              $(params.image-name):$(tasks.fetch-repository.results.commit)
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target"
-              - "target=$(params.target-name)"
+              - "$(params.target-name)"
-              - --import-cache
+              - --cache-from
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - "$(params.image-name)-buildcache"
-              - --export-cache
+              - --cache-to
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - "$(params.image-name)-buildcache"
-              - --opt
+          - name: REGISTRIES_CONF
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-          - name: BUILDKITD_TOML
             value: |
-              debug = true
+              unqualified-search-registries = ["docker.io"]
-              [registry."docker.io"]
+
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
+              [[registry]]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
+              location = "dockerhub.dockerhub.svc.cluster.local"
-                http = true
+              insecure = 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
@@ -139,7 +143,7 @@ spec:
             workspace: docker-credentials
         runAfter:
           - fetch-repository
-      - name: run-cargo-clippy
+      - name: run-test
         taskSpec:
           metadata: {}
           params:
@@ -190,7 +194,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     finally:
       - name: report-success
         when:
@@ -287,7 +291,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -317,4 +321,4 @@ spec:
     - name: path-to-image-context
       value: docker/organic_development/
     - name: path-to-dockerfile
-      value: docker/organic_development/
+      value: docker/organic_development/Dockerfile

.webhook_bridge/pipeline-rust-test.yaml

@@ -103,35 +103,39 @@ 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.fetch-repository.results.commit)",push=true,compression=zstd,compression-level=22,oci-mediatypes=true
+              $(params.image-name):$(tasks.fetch-repository.results.commit)
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target"
-              - "target=$(params.target-name)"
+              - "$(params.target-name)"
-              - --import-cache
+              - --cache-from
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - "$(params.image-name)-buildcache"
-              - --export-cache
+              - --cache-to
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - "$(params.image-name)-buildcache"
-              - --opt
+          - name: REGISTRIES_CONF
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-          - name: BUILDKITD_TOML
             value: |
-              debug = true
+              unqualified-search-registries = ["docker.io"]
-              [registry."docker.io"]
+
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
+              [[registry]]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
+              location = "dockerhub.dockerhub.svc.cluster.local"
-                http = true
+              insecure = 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
@@ -139,7 +143,7 @@ spec:
             workspace: docker-credentials
         runAfter:
           - fetch-repository
-      - name: run-cargo-test
+      - name: run-test
         taskSpec:
           metadata: {}
           params:
@@ -189,7 +193,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     finally:
       - name: report-success
         when:
@@ -286,7 +290,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(tasks.build-image.results.IMAGE_URL[0])"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -316,4 +320,4 @@ spec:
     - name: path-to-image-context
       value: docker/organic_test/
     - name: path-to-dockerfile
-      value: docker/organic_test/
+      value: docker/organic_test/Dockerfile

docker/organic_test/Dockerfile

@@ -19,7 +19,17 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
 FROM build AS build-emacs
 ARG EMACS_REPO
 ARG EMACS_VERSION
-ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
+
+RUN <<EOF
+set -euo pipefail
+IFS=$'\n\t'
+mkdir -p /root/emacs
+git -C /root/emacs init --initial-branch=main
+git -C /root/emacs remote add origin $EMACS_REPO
+git -C /root/emacs fetch origin $EMACS_VERSION
+git -C /root/emacs checkout FETCH_HEAD
+EOF
+#ADD "$EMACS_REPO#$EMACS_VERSION" /root/emacs
 WORKDIR /root/emacs
 RUN <<EOF
 mkdir /root/dist