Fix licenses, cleanup dockerfile

Author: jotak

.tekton/network-observability-cli-container-pull-request.yaml

@@ -26,7 +26,11 @@ spec:
     value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/netobserv-operator/network-observability-cli-container:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
+  - name: build-args-file
+    value: Dockerfile-args.downstream
   - name: dockerfile
     value: Dockerfile.downstream
+  - name: build-platforms
+    value: ["linux/x86_64"]
   pipelineRef:
     name: build-pipeline

.tekton/network-observability-cli-container-push.yaml

@@ -23,6 +23,10 @@ spec:
     value: '{{revision}}'
   - name: output-image
     value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/netobserv-operator/network-observability-cli-container:{{revision}}
+  - name: image-expires-after
+    value: 14d
+  - name: build-args-file
+    value: Dockerfile-args.downstream
   - name: dockerfile
     value: Dockerfile.downstream
   pipelineRef:

.tekton/pipeline-ref.yaml

@@ -247,28 +247,6 @@ spec:
       operator: in
       values:
       - "true"
-  - name: rpms-signature-scan
-    params:
-    - name: image-url
-      value: $(tasks.build-image-index.results.IMAGE_URL)
-    - name: image-digest
-      value: $(tasks.build-image-index.results.IMAGE_DIGEST)
-    runAfter:
-    - build-image-index
-    taskRef:
-      params:
-      - name: name
-        value: rpms-signature-scan
-      - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:d00d159c370e3c99447516970c316ef57dfd27c29e0ce3cff50727c9c40936d8
-      - name: kind
-        value: task
-      resolver: bundles
-    when:
-    - input: $(params.skip-checks)
-      operator: in
-      values:
-      - "false"
   - name: build-source-image
     params:
     - name: BINARY_IMAGE
@@ -319,6 +297,28 @@ spec:
       operator: in
       values:
       - "false"
+  - name: rpms-signature-scan
+    params:
+    - name: image-url
+      value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: image-digest
+      value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+    runAfter:
+    - build-image-index
+    taskRef:
+      params:
+      - name: name
+        value: rpms-signature-scan
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:d00d159c370e3c99447516970c316ef57dfd27c29e0ce3cff50727c9c40936d8
+      - name: kind
+        value: task
+      resolver: bundles
+    when:
+    - input: $(params.skip-checks)
+      operator: in
+      values:
+      - "false"
   - name: clair-scan
     params:
     - name: image-digest

Dockerfile-args.downstream

@@ -0,0 +1 @@
+BUILDVERSION=1.9.0

Dockerfile.downstream

@@ -1,18 +1,13 @@
-# We do not use --platform feature to auto fill this ARG because of incompatibility between podman and docker
-ARG TARGETARCH
-ARG COMMIT
+ARG BUILDVERSION
 
 # Make kubectl & oc scripts available for copy
 FROM registry.redhat.io/openshift4/ose-cli-rhel9:v4.18.0-202502040032.p0.ga50d4c0.assembly.stream.el9 as ose-cli
 
 # Build the manager binary
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as builder
-
-ARG TARGETARCH=amd64
-ARG COMMIT
-ARG BUILDVERSION="1.9.0"
-ARG IMAGE=registry.redhat.io/network-observability/network-observability-cli-rhel9:1.8
-ARG AGENT_IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9:1.8
+ARG BUILDVERSION
+ARG IMAGE=registry.redhat.io/network-observability/network-observability-cli-rhel9:${BUILDVERSION}
+ARG AGENT_IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9:${BUILDVERSION}
 
 WORKDIR /opt/app-root
 
@@ -24,7 +19,7 @@ COPY vendor/ vendor/
 
 # Build collector
 ENV GOEXPERIMENT strictfipsruntime
-RUN GOARCH=$TARGETARCH go build -tags strictfipsruntime -ldflags "-X 'main.buildVersion=${BUILDVERSION}' -X 'main.buildDate=`date +%Y-%m-%d\ %H:%M`'" -mod vendor -a -o build/network-observability-cli
+RUN go build -tags strictfipsruntime -ldflags "-X 'main.buildVersion=${BUILDVERSION}' -X 'main.buildDate=`date +%Y-%m-%d\ %H:%M`'" -mod vendor -a -o build/network-observability-cli
 
 # We still need Makefile & resources for oc-commands; copy them after go build for caching
 COPY commands/ commands/
@@ -40,10 +35,8 @@ RUN USER=netobserv VERSION="$BUILDVERSION" IMAGE="$IMAGE" AGENT_IMAGE="$AGENT_IM
 RUN mkdir -p output
 
 # Create final image from ubi + built binary and command
-FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi:9.5-1741850090
-
-ARG COMMIT
-ARG BUILDVERSION="1.9.0"
+FROM registry.access.redhat.com/ubi9/ubi:9.5-1741850090
+ARG BUILDVERSION
 
 WORKDIR /
 
@@ -54,6 +47,7 @@ COPY README.downstream ./README
 
 COPY --from=ose-cli /usr/bin/kubectl /usr/bin/kubectl
 COPY --from=ose-cli /usr/bin/oc /usr/bin/oc
+COPY LICENSE /licenses/
 
 USER 65532:65532
 
@@ -66,7 +60,5 @@ LABEL io.k8s.description="Network Observability CLI"
 LABEL summary="Network Observability CLI"
 LABEL maintainer="support@redhat.com"
 LABEL io.openshift.tags="network-observability-cli"
-LABEL upstream-vcs-type="git"
-LABEL upstream-vcs-ref=$COMMIT
 LABEL description="Network Observability CLI is a lightweight Flow, Packet and Metrics visualization tool for on-demand monitoring."
 LABEL version=$BUILDVERSION