Switch to buildah for the foreign document test.

BuildKit is having issues with caching which is causing problems with long builds like compiling emacs from source.

.dockerignore

@@ -3,3 +3,4 @@ target
 Cargo.lock
 notes/
 .lighthouse/
+/.webhook_bridge/

.webhook_bridge/pipeline-build-hash.yaml

@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: build
+  labels:
+    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -50,18 +52,6 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - 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: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
         params:
           - name: url
             value: $(params.REPO_URL)
@@ -69,6 +59,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: get-git-commit-time
         taskSpec:
           metadata: {}
@@ -101,7 +103,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -145,11 +147,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -169,6 +170,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -188,11 +191,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -212,6 +214,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -231,11 +235,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -255,6 +258,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -274,11 +279,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -298,6 +302,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -317,11 +323,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -341,6 +346,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -360,11 +367,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -389,6 +395,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -408,11 +416,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -437,6 +444,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -456,11 +465,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -491,6 +499,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -510,11 +520,10 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
+              default: alpine:3.20
           stepTemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
                 memory: 60Mi
@@ -541,6 +550,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -619,17 +630,13 @@ spec:
             - name: docker-image
               type: string
               description: Docker image to run.
-              default: alpine:3.18
-            - name: cache-subdir
-              type: string
-              description: subPath used in the persistent volume for the cargo cache.
-          steptemplate:
-            image: alpine:3.18
-            name: ""
-            resources:
+              default: alpine:3.20
+          stepTemplate:
+            image: alpine:3.20
+            computeResources:
               requests:
                 cpu: 10m
-                memory: 60Mi
+                memory: 600Mi
             workingDir: /workspace/source
           workspaces:
             - name: source
@@ -641,21 +648,19 @@ spec:
             - name: run
               image: $(params.docker-image)
               workingDir: "$(workspaces.source.path)"
-              command: ["ls", "$(workspaces.cargo-cache.path)"]
-              # command: [echo, $(params.cache-subdir)]
-              # command: [cargo, cache, --autoclean]
+              command: [cargo, cache, --autoclean]
               args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
           - name: cargo-cache
             workspace: cargo-cache
-            subPath: $(params.cache-subdir)
         params:
           - name: docker-image
             value: "$(tasks.build-image.results.IMAGE_URL[1])"
-          - name: cache-subdir
-            value: none
         # matrix:
         #   params:
         #     - name: cache-subdir

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

@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: foreign-document-test
+  labels:
+    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -50,18 +52,6 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - 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: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
         params:
           - name: url
             value: $(params.REPO_URL)
@@ -69,6 +59,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: get-git-commit-time
         taskSpec:
           metadata: {}
@@ -101,35 +103,39 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              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=$(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)
-          - name: BUILDKITD_TOML
+              - "--target"
+              - "$(params.target-name)"
+              - --cache-from
+              - "$(params.image-name)-buildcache"
+              - --cache-to
+              - "$(params.image-name)-buildcache"
+          - 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
@@ -165,6 +171,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -174,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:
@@ -261,6 +269,9 @@ spec:
               workingDir: "$(workspaces.source.path)"
               command: [cargo, cache, --autoclean]
               args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -268,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
@@ -298,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

@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-format
+  labels:
+    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -50,18 +52,6 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - 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: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
         params:
           - name: url
             value: $(params.REPO_URL)
@@ -69,6 +59,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: get-git-commit-time
         taskSpec:
           metadata: {}
@@ -101,7 +103,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -167,6 +169,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -294,6 +298,9 @@ spec:
               workingDir: "$(workspaces.source.path)"
               command: [cargo, cache, --autoclean]
               args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source

.webhook_bridge/pipeline-rust-clippy.yaml

@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-clippy
+  labels:
+    pdb: protect
 spec:
   taskRunTemplate:
     serviceAccountName: build-bot
@@ -50,18 +52,6 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - 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: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
         params:
           - name: url
             value: $(params.REPO_URL)
@@ -69,6 +59,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: get-git-commit-time
         taskSpec:
           metadata: {}
@@ -101,7 +103,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -177,6 +179,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -273,6 +277,9 @@ spec:
               workingDir: "$(workspaces.source.path)"
               command: [cargo, cache, --autoclean]
               args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source

.webhook_bridge/pipeline-rust-test.yaml

@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: rust-test
+  labels:
+    pdb: protect
 spec:
   timeouts:
     pipeline: "2h0m0s"
@@ -50,18 +52,6 @@ spec:
           - name: TARGET_URL
             value: "https://tekton.fizz.buzz/#/namespaces/$(context.pipelineRun.namespace)/pipelineruns/$(context.pipelineRun.name)"
       - 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: df36b3853a5657fd883015cdbf07ad6466918acf
-            - name: pathInRepo
-              value: task/git-clone/0.9/git-clone.yaml
-        workspaces:
-          - name: output
-            workspace: git-source
         params:
           - name: url
             value: $(params.REPO_URL)
@@ -69,6 +59,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: get-git-commit-time
         taskSpec:
           metadata: {}
@@ -101,7 +103,7 @@ spec:
             - name: url
               value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
             - name: pathInRepo
               value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
         params:
@@ -176,6 +178,8 @@ spec:
               env:
                 - name: CARGO_TARGET_DIR
                   value: /target
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source
@@ -272,6 +276,9 @@ spec:
               workingDir: "$(workspaces.source.path)"
               command: [cargo, cache, --autoclean]
               args: []
+              env:
+                - name: RUSTUP_PERMIT_COPY_RENAME
+                  value: "true"
         workspaces:
           - name: source
             workspace: git-source

.webhook_bridge/webhook_bridge.toml

@@ -1,31 +1,31 @@
 version = "0.0.1"
 
-[[push]]
-  name = "rust-test"
-  source = "pipeline-rust-test.yaml"
-  clone_uri = "git@code.fizz.buzz:talexander/organic.git"
-  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+# [[push]]
+#   name = "rust-test"
+#   source = "pipeline-rust-test.yaml"
+#   clone_uri = "git@code.fizz.buzz:talexander/organic.git"
+#   skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
 
 [[push]]
   name = "foreign-document-test"
   source = "pipeline-foreign-document-test.yaml"
   clone_uri = "git@code.fizz.buzz:talexander/organic.git"
-  branches = [ "^main$", "^master$" ]
+  branches = [ "^main$", "^master$", "^buildah$" ]
 
-[[push]]
-  name = "clippy"
-  source = "pipeline-rust-clippy.yaml"
-  clone_uri = "git@code.fizz.buzz:talexander/organic.git"
-  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+# [[push]]
+#   name = "clippy"
+#   source = "pipeline-rust-clippy.yaml"
+#   clone_uri = "git@code.fizz.buzz:talexander/organic.git"
+#   skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
 
-[[push]]
-  name = "format"
-  source = "pipeline-format.yaml"
-  clone_uri = "git@code.fizz.buzz:talexander/organic.git"
-  skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
+# [[push]]
+#   name = "format"
+#   source = "pipeline-format.yaml"
+#   clone_uri = "git@code.fizz.buzz:talexander/organic.git"
+#   skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ]
 
-[[push]]
-  name = "build"
-  source = "pipeline-build-hash.yaml"
-  clone_uri = "git@code.fizz.buzz:talexander/organic.git"
-  branches = [ "^main$", "^master$" ]
+# [[push]]
+#   name = "build"
+#   source = "pipeline-build-hash.yaml"
+#   clone_uri = "git@code.fizz.buzz:talexander/organic.git"
+#   branches = [ "^main$", "^master$" ]

docker/organic_test/Dockerfile

@@ -17,15 +17,27 @@ RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev
 
 
 FROM build AS build-emacs
-ARG EMACS_VERSION
 ARG EMACS_REPO
-RUN git clone --depth 1 --branch $EMACS_VERSION $EMACS_REPO /root/emacs
+ARG EMACS_VERSION
+
+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 mkdir /root/dist
-RUN ./autogen.sh
-RUN ./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
-RUN make
-RUN make DESTDIR="/root/dist" install
+RUN <<EOF
+mkdir /root/dist
+./autogen.sh
+./configure --prefix /usr --without-x --without-sound --with-native-compilation=aot
+make
+make DESTDIR="/root/dist" install
+EOF
 
 
 FROM build AS build-org-mode
@@ -37,8 +49,10 @@ RUN mkdir /root/dist
 RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION
 # RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin $ORG_REPO && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD
 WORKDIR /root/org-mode
-RUN make compile
-RUN make DESTDIR="/root/dist" install
+RUN <<EOF
+make compile
+make DESTDIR="/root/dist" install
+EOF
 
 
 FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester
@@ -118,8 +132,10 @@ RUN mkdir -p $LITERATE_BUILD_EMACS_PATH && git -C $LITERATE_BUILD_EMACS_PATH ini
 RUN rm $LITERATE_BUILD_EMACS_PATH/unused/aws.org
 
 FROM tester as foreign-document
-RUN apk add --no-cache bash coreutils
-RUN mkdir /foreign_documents
+RUN <<EOF
+apk add --no-cache bash coreutils
+mkdir /foreign_documents
+EOF
 COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
 COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
 COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg

flake.nix

@@ -35,9 +35,9 @@
           pkgs = import nixpkgs {
             inherit system overlays;
           };
-          rustToolchain =
-            (pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override
-              { targets = [ "wasm32-unknown-unknown" ]; };
+          rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
+            targets = [ "wasm32-unknown-unknown" ];
+          };
         in
         {
           default = pkgs.mkShell {
@@ -57,43 +57,10 @@
           pkgs = import nixpkgs {
             inherit system overlays;
           };
-          build_wasm =
-            {
-              bindgenTarget ? null,
-            }:
-            (pkgs.callPackage ./nix/package.nix {
-              targetBins = [
-                "wasm"
-              ];
-              features = [ "wasm" ];
-              cargoBuildTarget = "wasm32-unknown-unknown";
-              buildType = "wasm";
-            }).overrideAttrs
-              (
-                old:
-                let
-                  bindgen_command = [
-                    "${pkgs.wasm-bindgen-cli}/bin/wasm-bindgen"
-                    "--target"
-                    bindgenTarget
-                    "--out-dir"
-                    "target/wasm32-unknown-unknown/${bindgenTarget}"
-                    "target/wasm32-unknown-unknown/wasm/wasm.wasm"
-                  ];
-                in
-                {
-                  postBuild = ''
-                    ${pkgs.lib.escapeShellArgs bindgen_command}
-                  '';
-
-                  installPhase = ''
-                    mkdir -p $out/share/${bindgenTarget}
-                    cp target/wasm32-unknown-unknown/${bindgenTarget}/* $out/share/${bindgenTarget}
-                  '';
-                }
-              );
+          appliedOverlay = self.overlays.default pkgs pkgs;
         in
         rec {
+          default = all;
           all = pkgs.symlinkJoin {
             name = "all";
             paths = [
@@ -103,37 +70,93 @@
               wasm_web
             ];
           };
-          library = (pkgs.callPackage ./nix/package.nix { buildLib = true; }).overrideAttrs (
-            old:
-            let
-            in
-            {
-              installPhase = ''
-                mkdir -p $out/lib
-                cp target/*/release/liborganic.rlib $out/lib/
-              '';
-            }
-          );
-          devTools = pkgs.callPackage ./nix/package.nix {
-            targetBins = [
-              "parse"
-              "compare"
-            ];
-            features = [ "compare" ];
-          };
-          wasm_bundler = build_wasm { bindgenTarget = "bundler"; };
-          wasm_web = build_wasm { bindgenTarget = "web"; };
+          inherit (appliedOverlay.organic)
+            library
+            devTools
+            wasm_bundler
+            wasm_web
+            ;
           docker_env = pkgs.buildEnv {
             name = "organic";
             paths = with pkgs; [
-              devTools
+              appliedOverlay.organic.devTools
               bash
               uutils-coreutils-noprefix
               # toybox # Smaller than uutils-coreutils?
             ];
           };
-          default = all;
         }
       );
+      overlays.default = final: prev: {
+        organic = final.lib.makeScope final.newScope (
+          organicScope:
+          let
+            build_wasm =
+              {
+                bindgenTarget ? null,
+              }:
+              (organicScope.callPackage ./nix/package.nix {
+                inherit rust-overlay;
+                targetBins = [
+                  "wasm"
+                ];
+                features = [ "wasm" ];
+                cargoBuildTarget = "wasm32-unknown-unknown";
+                buildType = "wasm";
+              }).overrideAttrs
+                (
+                  old:
+                  let
+                    bindgen_command = [
+                      "${final.wasm-bindgen-cli}/bin/wasm-bindgen"
+                      "--target"
+                      bindgenTarget
+                      "--out-dir"
+                      "target/wasm32-unknown-unknown/${bindgenTarget}"
+                      "target/wasm32-unknown-unknown/wasm/wasm.wasm"
+                    ];
+                  in
+                  {
+                    postBuild = ''
+                      ${final.lib.escapeShellArgs bindgen_command}
+                    '';
+
+                    installPhase = ''
+                      mkdir -p $out/share/${bindgenTarget}
+                      cp target/wasm32-unknown-unknown/${bindgenTarget}/* $out/share/${bindgenTarget}
+                    '';
+                  }
+                );
+          in
+          {
+            library =
+              (organicScope.callPackage ./nix/package.nix {
+                inherit rust-overlay;
+                buildLib = true;
+              }).overrideAttrs
+                (
+                  old:
+                  let
+                  in
+                  {
+                    installPhase = ''
+                      mkdir -p $out/lib
+                      cp target/*/release/liborganic.rlib $out/lib/
+                    '';
+                  }
+                );
+            devTools = organicScope.callPackage ./nix/package.nix {
+              inherit rust-overlay;
+              targetBins = [
+                "parse"
+                "compare"
+              ];
+              features = [ "compare" ];
+            };
+            wasm_bundler = build_wasm { bindgenTarget = "bundler"; };
+            wasm_web = build_wasm { bindgenTarget = "web"; };
+          }
+        );
+      };
     };
 }

nix/package.nix

@@ -1,8 +1,8 @@
 {
   hello,
   lib,
-  makeRustPlatform,
-  pkgsBuildHost,
+  pkgs,
+  rust-overlay,
 
   targetBins ? [ ],
   features ? [ ],
@@ -12,34 +12,41 @@
 }:
 let
   cargoToml = (lib.importTOML ../Cargo.toml);
-  rustToolchain = (pkgsBuildHost.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
-    if cargoBuildTarget != null then
-      {
-        targets = [ cargoBuildTarget ];
-      }
-    else
-      { }
-  );
-  baseRustPlatform = (
-    makeRustPlatform {
-      cargo = rustToolchain;
-      rustc = rustToolchain;
-    }
-  );
-  rustPlatform =
-    if cargoBuildTarget != null then
-      baseRustPlatform.overrideScope (
-        final: prev: {
-          cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
-            rustcTargetSpec = cargoBuildTarget;
-          });
-          cargoInstallHook = hello;
+  rustPlatformFor =
+    pkgs:
+    let
+      rust-bin = rust-overlay.lib.mkRustBin { } pkgs;
+      rustToolchain = (rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
+        if cargoBuildTarget != null then
+          {
+            targets = [ cargoBuildTarget ];
+          }
+        else
+          { }
+      );
+      baseRustPlatform = (
+        pkgs.makeRustPlatform {
+          cargo = rustToolchain;
+          rustc = rustToolchain;
         }
-      )
-    else
-      baseRustPlatform;
+      );
+      rustPlatform =
+        if cargoBuildTarget != null then
+          baseRustPlatform.overrideScope (
+            final: prev: {
+              cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
+                rustcTargetSpec = cargoBuildTarget;
+              });
+              cargoInstallHook = hello;
+            }
+          )
+        else
+          baseRustPlatform;
+    in
+    rustPlatform;
 in
-rustPlatform.buildRustPackage (
+(rustPlatformFor pkgs).buildRustPackage (
+  # rustPlatform.buildRustPackage (
   {
     pname = "organic";
     version = cargoToml.package.version;

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2026-05-23"
 profile = "default"
 components = ["clippy", "rustfmt"]