diff --git a/.webhook_bridge/pipeline-format.yaml b/.webhook_bridge/pipeline-format.yaml index cb9aaf2..4a9e41e 100644 --- a/.webhook_bridge/pipeline-format.yaml +++ b/.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=$(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 @@ -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 diff --git a/.webhook_bridge/webhook_bridge.toml b/.webhook_bridge/webhook_bridge.toml index 15dff7b..e522654 100644 --- a/.webhook_bridge/webhook_bridge.toml +++ b/.webhook_bridge/webhook_bridge.toml @@ -12,18 +12,18 @@ version = "0.0.1" # clone_uri = "git@code.fizz.buzz:talexander/organic.git" # 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 = "format" -# source = "pipeline-format.yaml" +# 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 = "build" # source = "pipeline-build-hash.yaml"