File tree Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Expand file tree Collapse file tree 3 files changed +18
-6
lines changed Original file line number Diff line number Diff line change @@ -24,12 +24,14 @@ spec:
24
24
- name : revision
25
25
value : ' {{revision}}'
26
26
- name : output-image
27
- value : quay.io/rhceph-dev /snmp-notifier:on-pr-{{revision}}
27
+ value : quay.io/rhceph-ci /snmp-notifier:on-pr-v7.1 -{{revision}}
28
28
- name : image-expires-after
29
29
value : 5d
30
30
- name : build-platforms
31
31
value :
32
32
- linux/x86_64
33
+ - linux/s390x
34
+ - linux/ppc64le
33
35
- name : dockerfile
34
36
value : Dockerfile
35
37
- name : path-context
@@ -554,6 +556,11 @@ spec:
554
556
value : $(tasks.build-image-index.results.IMAGE_URL)
555
557
- name : IMAGE_DIGEST
556
558
value : $(tasks.build-image-index.results.IMAGE_DIGEST)
559
+ - name : ADDITIONAL_TAGS
560
+ value :
561
+ - " pull-request-{{pull_request_number}}"
562
+ - " from-branch-{{source_branch}}"
563
+ - " {{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
557
564
runAfter :
558
565
- build-image-index
559
566
taskRef :
Original file line number Diff line number Diff line change @@ -23,10 +23,12 @@ spec:
23
23
- name : revision
24
24
value : ' {{revision}}'
25
25
- name : output-image
26
- value : quay.io/rhceph-dev /snmp-notifier:{{revision}}
26
+ value : quay.io/rhceph-ci /snmp-notifier:v7.1- {{revision}}
27
27
- name : build-platforms
28
28
value :
29
29
- linux/x86_64
30
+ - linux/s390x
31
+ - linux/ppc64le
30
32
- name : dockerfile
31
33
value : Dockerfile
32
34
- name : path-context
@@ -551,6 +553,10 @@ spec:
551
553
value : $(tasks.build-image-index.results.IMAGE_URL)
552
554
- name : IMAGE_DIGEST
553
555
value : $(tasks.build-image-index.results.IMAGE_DIGEST)
556
+ - name : ADDITIONAL_TAGS
557
+ value :
558
+ - " v7.1"
559
+ - " {{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
554
560
runAfter :
555
561
- build-image-index
556
562
taskRef :
Original file line number Diff line number Diff line change 1
1
# Build stage 1
2
2
3
3
# FROM openshift/golang-builder:rhel_9_golang_1.23 AS builder
4
- FROM quay.io/projectquay/golang:1.23 AS builder
4
+ FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.23 AS builder
5
5
6
6
COPY snmp_notifier snmp_notifier
7
7
@@ -22,7 +22,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -mod=readonly \
22
22
-a -tags netgo
23
23
24
24
# Build stage 2
25
- FROM registry.redhat.io /ubi9/ubi -minimal
25
+ FROM --platform=$BUILDPLATFORM registry.access. redhat.com /ubi9-minimal:latest
26
26
27
27
# Update the image to get the latest CVE updates
28
28
RUN microdnf update -y && \
@@ -46,5 +46,4 @@ RUN chmod +x "$OPBIN"
46
46
47
47
EXPOSE 9464
48
48
ENTRYPOINT ["/usr/local/bin/snmp_notifier" ]
49
- CMD ["--snmp.trap-description-template=/etc/snmp_notifier/description-template.tpl" ]
50
-
49
+ CMD ["--snmp.trap-description-template=/etc/snmp_notifier/description-template.tpl" ]
You can’t perform that action at this time.
0 commit comments