Skip to content

Commit e53dfa7

Browse files
author
Anna Rania
committed
Fix Conforma violations in fbc-update-planner image
1 parent 55112bc commit e53dfa7

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

.tekton/fbc-update-planner-pull-request.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
value: 5d
2929
- name: dockerfile
3030
value: Dockerfile
31+
- name: prefetch-input
32+
value: '{"type": "gomod", "path": "."}'
3133
pipelineSpec:
3234
description: |
3335
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -59,7 +61,7 @@ spec:
5961
description: Skip checks against built image
6062
name: skip-checks
6163
type: string
62-
- default: "false"
64+
- default: "true"
6365
description: Execute the build with network isolation
6466
name: hermetic
6567
type: string
@@ -72,7 +74,7 @@ spec:
7274
1h, 2d, 3w for hours, days, and weeks, respectively.
7375
name: image-expires-after
7476
type: string
75-
- default: "false"
77+
- default: "true"
7678
description: Build a source image.
7779
name: build-source-image
7880
type: string
@@ -153,7 +155,7 @@ spec:
153155
- name: name
154156
value: git-clone-oci-ta
155157
- name: bundle
156-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:89da85c1508b3a2b7ad884c1215b9fd3a7d9e28c2335aca6750948d129707035
158+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
157159
- name: kind
158160
value: task
159161
resolver: bundles
@@ -317,7 +319,7 @@ spec:
317319
- name: name
318320
value: clair-scan
319321
- name: bundle
320-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
322+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
321323
- name: kind
322324
value: task
323325
resolver: bundles
@@ -365,7 +367,7 @@ spec:
365367
- name: name
366368
value: sast-snyk-check-oci-ta
367369
- name: bundle
368-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.5@sha256:bdd187c336ee2e9e83e7a98b3e405635f3d3caf5d56c7780212469a3f3809c5c
370+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.5@sha256:91980bb3d6ba0b200a2030f2be0722da0fbc9338c0c6ff897d0005a2f1259a9b
369371
- name: kind
370372
value: task
371373
resolver: bundles
@@ -415,7 +417,7 @@ spec:
415417
- name: name
416418
value: sast-shell-check-oci-ta
417419
- name: bundle
418-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
420+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:fc685d6f7dfb7c9ab2f2db38bbe2c8d383407847350ccd8b96352322c487b13c
419421
- name: kind
420422
value: task
421423
resolver: bundles
@@ -443,7 +445,7 @@ spec:
443445
- name: name
444446
value: sast-unicode-check-oci-ta
445447
- name: bundle
446-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
448+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:5807ffe3a0cca5cf970076bbc7a404642cc6e3eebe64e9e5e6a4f20da740bf73
447449
- name: kind
448450
value: task
449451
resolver: bundles
@@ -505,7 +507,7 @@ spec:
505507
- name: name
506508
value: rpms-signature-scan
507509
- name: bundle
508-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:c78924dc4178da2356f4e8ee04e4ee5022e27851cc7d722765a2b0d337fdb069
510+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
509511
- name: kind
510512
value: task
511513
resolver: bundles

.tekton/fbc-update-planner-push.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
value: quay.io/redhat-user-workloads/operator-foundry-tenant/fbc-update-planner:{{revision}}
2626
- name: dockerfile
2727
value: Dockerfile
28+
- name: prefetch-input
29+
value: '{"type": "gomod", "path": "."}'
2830
pipelineSpec:
2931
description: |
3032
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -56,7 +58,7 @@ spec:
5658
description: Skip checks against built image
5759
name: skip-checks
5860
type: string
59-
- default: "false"
61+
- default: "true"
6062
description: Execute the build with network isolation
6163
name: hermetic
6264
type: string
@@ -69,7 +71,7 @@ spec:
6971
1h, 2d, 3w for hours, days, and weeks, respectively.
7072
name: image-expires-after
7173
type: string
72-
- default: "false"
74+
- default: "true"
7375
description: Build a source image.
7476
name: build-source-image
7577
type: string
@@ -150,7 +152,7 @@ spec:
150152
- name: name
151153
value: git-clone-oci-ta
152154
- name: bundle
153-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.2@sha256:89da85c1508b3a2b7ad884c1215b9fd3a7d9e28c2335aca6750948d129707035
155+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d30f13dd15daf89dd6dc645243b3444d35570d13f7840c3fd65e366022515205
154156
- name: kind
155157
value: task
156158
resolver: bundles
@@ -314,7 +316,7 @@ spec:
314316
- name: name
315317
value: clair-scan
316318
- name: bundle
317-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
319+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
318320
- name: kind
319321
value: task
320322
resolver: bundles
@@ -362,7 +364,7 @@ spec:
362364
- name: name
363365
value: sast-snyk-check-oci-ta
364366
- name: bundle
365-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.5@sha256:bdd187c336ee2e9e83e7a98b3e405635f3d3caf5d56c7780212469a3f3809c5c
367+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.5@sha256:91980bb3d6ba0b200a2030f2be0722da0fbc9338c0c6ff897d0005a2f1259a9b
366368
- name: kind
367369
value: task
368370
resolver: bundles
@@ -412,7 +414,7 @@ spec:
412414
- name: name
413415
value: sast-shell-check-oci-ta
414416
- name: bundle
415-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
417+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:fc685d6f7dfb7c9ab2f2db38bbe2c8d383407847350ccd8b96352322c487b13c
416418
- name: kind
417419
value: task
418420
resolver: bundles
@@ -440,7 +442,7 @@ spec:
440442
- name: name
441443
value: sast-unicode-check-oci-ta
442444
- name: bundle
443-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
445+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:5807ffe3a0cca5cf970076bbc7a404642cc6e3eebe64e9e5e6a4f20da740bf73
444446
- name: kind
445447
value: task
446448
resolver: bundles
@@ -502,7 +504,7 @@ spec:
502504
- name: name
503505
value: rpms-signature-scan
504506
- name: bundle
505-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:c78924dc4178da2356f4e8ee04e4ee5022e27851cc7d722765a2b0d337fdb069
507+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
506508
- name: kind
507509
value: task
508510
resolver: bundles

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.26 AS builder
33
WORKDIR /opt/app-root/src
44
ENV CGO_ENABLED=0
55

6-
# Cache module downloads separately from source changes
7-
COPY --chown=1001:0 go.mod go.sum ./
8-
RUN go mod download
9-
6+
# Copy all sources, including go.mod and go.sum, at once
107
COPY --chown=1001:0 . .
118

9+
# Konflux will automatically inject `. /cachi2/cachi2.env &&` before this RUN
10+
# to point the Go toolchain to the offline dependency cache it prefetched.
1211
RUN LDFLAGS="-s -w" make build
1312

1413
## Final image

0 commit comments

Comments
 (0)