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.
This commit is contained in:
Tom Alexander
2026-09-06 18:24:15 -04:00
parent 336b5d3d54
commit 99dab75a65
2 changed files with 47 additions and 40 deletions

View File

@@ -103,34 +103,41 @@ 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: dda8e0cf8f037c900700690ac00da464d19876cb
- 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" - --storage-driver=vfs
- "target=$(params.target-name)" - "--target"
- --import-cache - "$(params.target-name)"
- "type=registry,ref=$(params.image-name):buildcache" - --cache-from
- --export-cache - "$(params.image-name)-buildcache"
- "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true" - --cache-to
- --opt - "$(params.image-name)-buildcache"
- build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time) # - --opt
- name: BUILDKITD_TOML # - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
- name: REGISTRIES_CONF
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
[[registry]]
location = "docker.io"
[[registry.mirror]]
location = "dockerhub.dockerhub.svc.cluster.local" # Replace with your mirror URL
insecure = true insecure = true
workspaces: workspaces:
- name: source - name: source
@@ -305,4 +312,4 @@ spec:
- name: path-to-image-context - name: path-to-image-context
value: docker/organic_test/ value: docker/organic_test/
- name: path-to-dockerfile - name: path-to-dockerfile
value: docker/organic_test/ value: docker/organic_test/Dockerfile

View File

@@ -1,31 +1,31 @@
version = "0.0.1" version = "0.0.1"
[[push]] # [[push]]
name = "rust-test" # name = "rust-test"
source = "pipeline-rust-test.yaml" # source = "pipeline-rust-test.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]] [[push]]
name = "foreign-document-test" name = "foreign-document-test"
source = "pipeline-foreign-document-test.yaml" source = "pipeline-foreign-document-test.yaml"
clone_uri = "git@code.fizz.buzz:talexander/organic.git" clone_uri = "git@code.fizz.buzz:talexander/organic.git"
branches = [ "^main$", "^master$" ] branches = [ "^main$", "^master$", "^buildah$" ]
[[push]] # [[push]]
name = "clippy" # name = "clippy"
source = "pipeline-rust-clippy.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]] # [[push]]
name = "format" # name = "format"
source = "pipeline-format.yaml" # source = "pipeline-format.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]] # [[push]]
name = "build" # name = "build"
source = "pipeline-build-hash.yaml" # source = "pipeline-build-hash.yaml"
clone_uri = "git@code.fizz.buzz:talexander/organic.git" # clone_uri = "git@code.fizz.buzz:talexander/organic.git"
branches = [ "^main$", "^master$" ] # branches = [ "^main$", "^master$" ]