Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 41 additions & 12 deletions .tekton/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ spec:
- default: "false"
description: Enable cache proxy configuration
name: enable-cache-proxy
- default: "true"
description: Use the package registry proxy when prefetching dependencies
name: enable-package-registry-proxy
- default: .
description: Target directories in component's source code to scan with SAST tools.
Multiple values should be separated with commas.
name: sast-target-dirs
type: string
- default: []
description: Array of --build-arg values ("arg=value" strings) for buildah
name: build-args
Expand All @@ -100,10 +108,22 @@ spec:
VMs
name: privileged-nested
type: string
- name: sast-target-dirs
- default: ""
description: Sets the image created time and the SOURCE_DATE_EPOCH build argument.
On its own, it does not change file timestamps inside the layers (set rewrite-timestamp
to "true" for that). Leave empty to keep the actual build time.
name: source-date-epoch
type: string
- default: "false"
description: When "true", clamp file modification times in the image layers to
at most source-date-epoch. Does nothing unless source-date-epoch is set.
name: rewrite-timestamp
type: string
- default: "false"
description: When "true", omit the build history (history timestamps, layer metadata,
etc.) from the resulting image.
name: omit-history
type: string
default: .
description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
results:
- description: ""
name: IMAGE_URL
Expand All @@ -126,12 +146,12 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
runAfter:
- build-image-index
taskRef:
Expand All @@ -154,6 +174,8 @@ spec:
value: $(params.prefetch-input-dev-package-managers)
- name: input
value: $(params.prefetch-input)
- name: enable-package-registry-proxy
value: $(params.enable-package-registry-proxy)
- name: SOURCE_ARTIFACT
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
- name: ociStorage
Expand Down Expand Up @@ -268,6 +290,12 @@ spec:
value: $(tasks.init.results.http-proxy)
- name: NO_PROXY
value: $(tasks.init.results.no-proxy)
- name: SOURCE_DATE_EPOCH
value: $(params.source-date-epoch)
- name: REWRITE_TIMESTAMP
value: $(params.rewrite-timestamp)
- name: OMIT_HISTORY
value: $(params.omit-history)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
Expand Down Expand Up @@ -360,7 +388,7 @@ spec:
- name: image-platform
value:
- $(params.build-platforms)
name: clair-scan
name: roxctl-scan
params:
- name: image-digest
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
Expand All @@ -371,12 +399,13 @@ spec:
taskRef:
params:
- name: name
value: clair-scan
value: roxctl-scan
- name: bundle
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
value: quay.io/konflux-ci/tekton-catalog/task-roxctl-scan:0.1@sha256:97e2b2cdca9110fdc8a93ba585a1a1a743f989f2fd85f4073f6e5ea9ad2ce828
- name: kind
value: task
resolver: bundles
timeout: 20m
when:
- input: $(params.skip-checks)
operator: in
Expand Down Expand Up @@ -440,12 +469,12 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
runAfter:
- build-image-index
taskRef:
Expand All @@ -468,12 +497,12 @@ spec:
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-image-index.results.IMAGE_URL)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
- name: SOURCE_ARTIFACT
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
- name: CACHI2_ARTIFACT
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
- name: TARGET_DIRS
value: $(params.sast-target-dirs)
runAfter:
- build-image-index
taskRef:
Expand Down
2 changes: 1 addition & 1 deletion .tekton/kn-plugin-func-func-util-121-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
- name: build-args
value:
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.26
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
Expand Down
2 changes: 1 addition & 1 deletion .tekton/kn-plugin-func-func-util-121-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
- name: build-args
value:
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.26
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
Expand Down
2 changes: 1 addition & 1 deletion openshift/ci-operator/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools

# Dockerfile to bootstrap build and test in openshift-ci
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21 as builder
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23 as builder

ARG TARGETARCH

Expand Down
2 changes: 1 addition & 1 deletion openshift/ci-operator/knative-images/func-util/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# DO NOT EDIT! Generated Dockerfile for cmd/func-util.
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal

FROM $GO_BUILDER as builder
Expand Down
Loading
Loading