Migrate format to buildah.
All checks were successful
format Build format has succeeded

This commit is contained in:
Tom Alexander
2026-10-16 01:39:10 -04:00
parent 438ca5324f
commit 2ff270e722
2 changed files with 34 additions and 30 deletions

View File

@@ -7,7 +7,7 @@ metadata:
spec: spec:
timeouts: timeouts:
pipeline: "2h0m0s" pipeline: "2h0m0s"
tasks: "1h0m0s" tasks: "1h0m40s"
finally: "0h30m0s" finally: "0h30m0s"
taskRunTemplate: taskRunTemplate:
serviceAccountName: build-bot serviceAccountName: build-bot
@@ -103,35 +103,39 @@ spec:
- name: url - name: url
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
- name: revision - name: revision
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1 value: 9c6d3bc418dc2f54d73bdfa984bce3eb6c65fd60
- name: pathInRepo - 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: params:
- name: OUTPUT - name: OUTPUT
value: >- 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 - name: CONTEXT
value: $(params.path-to-image-context) value: $(params.path-to-image-context)
- name: DOCKERFILE - name: DOCKERFILE
value: $(params.path-to-dockerfile) value: $(params.path-to-dockerfile)
- name: EXTRA_ARGS - name: EXTRA_ARGS
value: 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: | 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: workspaces:
- name: source - name: source
workspace: git-source workspace: git-source
@@ -180,7 +184,7 @@ spec:
- build-image - build-image
params: params:
- name: docker-image - name: docker-image
value: "$(tasks.build-image.results.IMAGE_URL[1])" value: "$(tasks.build-image.results.IMAGE_URL[0])"
- name: commit-changes - name: commit-changes
taskRef: taskRef:
resolver: git resolver: git
@@ -308,7 +312,7 @@ spec:
workspace: cargo-cache workspace: cargo-cache
params: params:
- name: docker-image - name: docker-image
value: "$(tasks.build-image.results.IMAGE_URL[1])" value: "$(tasks.build-image.results.IMAGE_URL[0])"
workspaces: workspaces:
- name: git-source - name: git-source
- name: docker-credentials - name: docker-credentials
@@ -338,4 +342,4 @@ spec:
- name: path-to-image-context - name: path-to-image-context
value: docker/organic_development/ value: docker/organic_development/
- name: path-to-dockerfile - name: path-to-dockerfile
value: docker/organic_development/ value: docker/organic_development/Dockerfile

View File

@@ -12,18 +12,18 @@ version = "0.0.1"
# clone_uri = "git@code.fizz.buzz:talexander/organic.git" # clone_uri = "git@code.fizz.buzz:talexander/organic.git"
# branches = [ "^main$", "^master$", "^buildah$" ] # 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]] # [[push]]
# name = "format" # name = "clippy"
# source = "pipeline-format.yaml" # source = "pipeline-rust-clippy.yaml"
# clone_uri = "git@code.fizz.buzz:talexander/organic.git" # clone_uri = "git@code.fizz.buzz:talexander/organic.git"
# skip_branches = [ "^v[0-9]+\\.[0-9]+\\.[0-9]+$" ] # 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]] # [[push]]
# name = "build" # name = "build"
# source = "pipeline-build-hash.yaml" # source = "pipeline-build-hash.yaml"