.webhook_bridge/pipeline-build-hash.yaml

@@ -69,74 +69,42 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--destination=$(params.image-name)" # Also write the :latest image
-              - "target=$(params.target-name)"
+              - "--target=$(params.target-name)"
-              - --import-cache
+              - --cache=true
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-copy-layers
-              - --export-cache
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --use-new-run # Should result in a speed-up
-              - --opt
+              - --reproducible # To remove timestamps so layer caching works.
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --snapshot-mode=redo
-          - name: BUILDKITD_TOML
+              - --skip-unused-stages=true
-            value: |
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       #############
       - name: run-image-none
         taskSpec:
@@ -179,7 +147,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-tracing
         taskSpec:
@@ -222,7 +190,7 @@ spec:
           - run-image-none
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-compare
         taskSpec:
@@ -265,7 +233,7 @@ spec:
           - run-image-tracing
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-default
         taskSpec:
@@ -308,7 +276,7 @@ spec:
           - run-image-compare
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-tracing-compare
         taskSpec:
@@ -351,7 +319,7 @@ spec:
           - run-image-default
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-compare-foreign
         taskSpec:
@@ -399,7 +367,7 @@ spec:
           - run-image-tracing-compare
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-all
         taskSpec:
@@ -447,7 +415,7 @@ spec:
           - run-image-compare-foreign
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-wasm
         taskSpec:
@@ -501,7 +469,7 @@ spec:
           - run-image-all
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
       - name: run-image-wasm-test
         taskSpec:
@@ -551,7 +519,7 @@ spec:
           - run-image-wasm
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       #############
     finally:
       - name: report-success
@@ -653,7 +621,7 @@ spec:
             subPath: $(params.cache-subdir)
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
           - name: cache-subdir
             value: none
         # matrix:
@@ -698,4 +666,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

@@ -69,74 +69,41 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-test
         taskSpec:
           metadata: {}
@@ -174,7 +141,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:
@@ -268,7 +235,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -298,4 +265,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

@@ -69,74 +69,41 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-fmt
         taskSpec:
           metadata: {}
@@ -176,7 +143,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
       - name: commit-changes
         taskRef:
           resolver: git
@@ -301,7 +268,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -331,4 +298,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

@@ -69,74 +69,41 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-clippy
         taskSpec:
           metadata: {}
@@ -186,7 +153,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:
@@ -280,7 +247,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -310,4 +277,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

@@ -69,74 +69,41 @@ spec:
             value: $(params.PULL_BASE_SHA)
           - name: deleteExisting
             value: "true"
-      - name: get-git-commit-time
-        taskSpec:
-          metadata: {}
-          stepTemplate:
-            image: alpine:3.20
-            computeResources:
-              requests:
-                cpu: 10m
-                memory: 600Mi
-            workingDir: "$(workspaces.repo.path)"
-          results:
-            - name: unix-time
-              description: The time of the git commit in unix timestamp format.
-          steps:
-            - image: alpine/git:v2.34.2
-              name: detect-tag-step
-              script: |
-                #!/usr/bin/env sh
-                set -euo pipefail
-                echo -n "$(git log -1 --pretty=%ct)" | tee $(results.unix-time.path)
-        workspaces:
-          - name: repo
-            workspace: git-source
-        runAfter:
-          - fetch-repository
       - name: build-image
         taskRef:
           resolver: git
           params:
             - name: url
-              value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
+              value: https://code.fizz.buzz/mirror/catalog.git # mirror of https://github.com/tektoncd/catalog.git
             - name: revision
-              value: 7ee31a185243ee6da13dcd26a592c585b64c80e5
+              value: df36b3853a5657fd883015cdbf07ad6466918acf
             - name: pathInRepo
-              value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
+              value: task/kaniko/0.6/kaniko.yaml
         params:
-          - name: OUTPUT
+          - name: IMAGE
-            value: >-
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
-              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
           - name: CONTEXT
             value: $(params.path-to-image-context)
           - name: DOCKERFILE
             value: $(params.path-to-dockerfile)
+          - name: BUILDER_IMAGE
+            value: "gcr.io/kaniko-project/executor:v1.12.1"
           - name: EXTRA_ARGS
             value:
-              - "--opt"
+              - "--target=$(params.target-name)"
-              - "target=$(params.target-name)"
+              - --cache=true
-              - --import-cache
+              - --cache-copy-layers
-              - "type=registry,ref=$(params.image-name):buildcache"
+              - --cache-repo=harbor.fizz.buzz/kanikocache/cache
-              - --export-cache
+              - --use-new-run # Should result in a speed-up
-              - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
+              - --reproducible # To remove timestamps so layer caching works.
-              - --opt
+              - --snapshot-mode=redo
-              - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
+              - --skip-unused-stages=true
-          - name: BUILDKITD_TOML
+              - --registry-mirror=dockerhub.dockerhub.svc.cluster.local
-            value: |
-              debug = true
-              [registry."docker.io"]
-                mirrors = ["dockerhub.dockerhub.svc.cluster.local"]
-              [registry."dockerhub.dockerhub.svc.cluster.local"]
-                http = true
-                insecure = true
         workspaces:
           - name: source
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-        runAfter:
-          - fetch-repository
       - name: run-cargo-test
         taskSpec:
           metadata: {}
@@ -185,7 +152,7 @@ spec:
           - build-image
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     finally:
       - name: report-success
         when:
@@ -279,7 +246,7 @@ spec:
             workspace: cargo-cache
         params:
           - name: docker-image
-            value: "$(tasks.build-image.results.IMAGE_URL[1])"
+            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
     workspaces:
       - name: git-source
       - name: docker-credentials
@@ -309,4 +276,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_development/Dockerfile

@@ -1,10 +1,7 @@
-# syntax=docker/dockerfile:1
+FROM rustlang/rust:nightly-alpine3.20 AS builder
-ARG ALPINE_VERSION="3.20"
-
-FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS builder
 
 RUN apk add --no-cache musl-dev
-RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked cargo install --locked --no-default-features --features ci-autoclean cargo-cache
+RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
 RUN rustup component add rustc-codegen-cranelift
 
 FROM builder AS format

docker/organic_test/Dockerfile

@@ -1,6 +1,3 @@
-# syntax=docker/dockerfile:1
-ARG ALPINE_VERSION="3.20"
-
 # ARG EMACS_REPO=https://git.savannah.gnu.org/git/emacs.git
 ARG EMACS_REPO=https://code.fizz.buzz/mirror/emacs.git
 
@@ -12,7 +9,7 @@ ARG ORG_MODE_REPO=https://code.fizz.buzz/mirror/org-mode.git
 ARG ORG_VERSION=abf5156096c06ee5aa05795c3dc5a065f76ada97
 
 
-FROM alpine:$ALPINE_VERSION AS build
+FROM alpine:3.20 AS build
 RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev ncurses-dev gawk libgccjit-dev
 
 
@@ -31,7 +28,7 @@ RUN make DESTDIR="/root/dist" install
 FROM build AS build-org-mode
 ARG ORG_VERSION
 ARG ORG_MODE_REPO
-COPY --link --from=build-emacs /root/dist/ /
+COPY --from=build-emacs /root/dist/ /
 RUN mkdir /root/dist
 # Savannah does not allow fetching specific revisions, so we're going to have to put unnecessary load on their server by cloning main and then checking out the revision we want.
 RUN git clone $ORG_MODE_REPO /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION
@@ -41,13 +38,13 @@ RUN make compile
 RUN make DESTDIR="/root/dist" install
 
 
-FROM rustlang/rust:nightly-alpine$ALPINE_VERSION AS tester
+FROM rustlang/rust:nightly-alpine3.20 AS tester
 ENV LANG=en_US.UTF-8
 RUN apk add --no-cache musl-dev ncurses gnutls libgccjit
-RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked cargo install --locked --no-default-features --features ci-autoclean cargo-cache
+RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
 RUN rustup component add rustc-codegen-cranelift
-COPY --link --from=build-emacs /root/dist/ /
+COPY --from=build-emacs /root/dist/ /
-COPY --link --from=build-org-mode /root/dist/ /
+COPY --from=build-org-mode /root/dist/ /
 
 ENTRYPOINT ["cargo", "test"]
 
@@ -120,10 +117,10 @@ 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
-COPY --link --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
+COPY --from=foreign-document-gather /foreign_documents/howardabrams /foreign_documents/howardabrams
-COPY --link --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
+COPY --from=foreign-document-gather /foreign_documents/doomemacs /foreign_documents/doomemacs
-COPY --link --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg
+COPY --from=foreign-document-gather /foreign_documents/worg /foreign_documents/worg
-COPY --link --from=foreign-document-gather /foreign_documents/literate_build_emacs /foreign_documents/literate_build_emacs
+COPY --from=foreign-document-gather /foreign_documents/literate_build_emacs /foreign_documents/literate_build_emacs
-COPY --link --from=build-org-mode /root/org-mode /foreign_documents/org-mode
+COPY --from=build-org-mode /root/org-mode /foreign_documents/org-mode
-COPY --link --from=build-emacs /root/emacs /foreign_documents/emacs
+COPY --from=build-emacs /root/emacs /foreign_documents/emacs
 ENTRYPOINT ["cargo", "run", "--bin", "foreign_document_test", "--features", "compare,foreign_document_test", "--profile", "release-lto"]