.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
     finally:
       - name: report-success
         when:
@@ -221,4 +189,4 @@ spec:
     - name: path-to-image-context
       value: .
     - name: path-to-dockerfile
-      value: docker/ta_waybar_pipewire/
+      value: docker/ta_waybar_pipewire/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/ta_waybar_pipewire_development/
     - name: path-to-dockerfile
-      value: docker/ta_waybar_pipewire_development/
+      value: docker/ta_waybar_pipewire_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/ta_waybar_pipewire_development/
     - name: path-to-dockerfile
-      value: docker/ta_waybar_pipewire_development/
+      value: docker/ta_waybar_pipewire_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: {}
@@ -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)"
     finally:
       - name: report-success
         when:
@@ -270,7 +237,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
@@ -300,4 +267,4 @@ spec:
     - name: path-to-image-context
       value: docker/ta_waybar_pipewire_development/
     - name: path-to-dockerfile
-      value: docker/ta_waybar_pipewire_development/
+      value: docker/ta_waybar_pipewire_development/Dockerfile

docker/ta_waybar_pipewire/Dockerfile

@@ -1,16 +1,13 @@
-# 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 pkgconf pipewire-dev clang-dev
 
 RUN mkdir /root/ta_waybar_pipewire
 WORKDIR /root/ta_waybar_pipewire
-COPY --link . .
+COPY . .
 # TODO: Add static build, which currently errors due to proc_macro. RUSTFLAGS="-C target-feature=+crt-static"
-RUN --mount=type=tmpfs,target=/tmp --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked CARGO_TARGET_DIR=/target cargo build --profile release-lto
+RUN CARGO_TARGET_DIR=/target cargo build --profile release-lto
 
-FROM alpine:$ALPINE_VERSION AS runner
+FROM alpine:3.20 AS runner
 
-COPY --link --from=builder /target/release-lto/ta_waybar_pipewire /usr/bin/
+COPY --from=builder /target/release-lto/ta_waybar_pipewire /usr/bin/

docker/ta_waybar_pipewire_development/Dockerfile

@@ -1,9 +1,6 @@
-# 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 pkgconf pipewire-dev clang-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 rustfmt
 RUN rustup component add clippy