Resolve Enterprise Contract failures

- Clean up Dockerfiles - Add image labels Signed-off-by: Dale Haiducek <[email protected]>
stolostron · Jan 16, 2025 · a97bac2 · a97bac2
1 parent deab457
commit a97bac2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/.tekton/cert-policy-controller-acm-213-pull-request.yaml b/.tekton/cert-policy-controller-acm-213-pull-request.yaml
@@ -32,6 +32,8 @@ spec:
       value: build/Dockerfile.rhtap
     - name: path-context
       value: .
+    - name: build-source-image
+      value: "true"
     - name: hermetic
       value: "true"
     - name: prefetch-input

diff --git a/.tekton/cert-policy-controller-acm-213-push.yaml b/.tekton/cert-policy-controller-acm-213-push.yaml
@@ -29,6 +29,8 @@ spec:
       value: build/Dockerfile.rhtap
     - name: path-context
       value: .
+    - name: build-source-image
+      value: "true"
     - name: hermetic
       value: "true"
     - name: prefetch-input

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -24,10 +24,16 @@ COPY --from=builder ${REPO_PATH}/build/_output/bin/${COMPONENT} ${OPERATOR}
 COPY --from=builder ${REPO_PATH}/build/bin /usr/local/bin
 RUN  /usr/local/bin/user_setup
 
-RUN microdnf update -y && \
-    microdnf install -y shadow-utils procps && \
-    microdnf clean all
+RUN microdnf install -y shadow-utils procps
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 USER ${USER_UID}
+
+LABEL name="rhacm2/cert-policy-controller-rhel9"
+LABEL summary="Monitor certificates on the cluster"
+LABEL description="The CertificatePolicy kind compares the desired state of certificates with certificates on the cluster."
+LABEL io.k8s.display-name="CertificatePolicy controller"
+LABEL io.k8s.description="The CertificatePolicy kind compares the desired state of certificates with certificates on the cluster."
+LABEL com.redhat.component="acm-cert-policy-controller-container"
+LABEL io.openshift.tags="data,images"
diff --git a/build/Dockerfile.rhtap b/build/Dockerfile.rhtap
@@ -24,10 +24,16 @@ COPY --from=builder ${REPO_PATH}/build/_output/bin/${COMPONENT} ${OPERATOR}
 COPY --from=builder ${REPO_PATH}/build/bin /usr/local/bin
 RUN  /usr/local/bin/user_setup
 
-RUN microdnf update -y && \
-    microdnf install -y shadow-utils procps && \
-    microdnf clean all
+RUN microdnf install -y shadow-utils procps
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 
 USER ${USER_UID}
+
+LABEL name="rhacm2/cert-policy-controller-rhel9"
+LABEL summary="Monitor certificates on the cluster"
+LABEL description="The CertificatePolicy kind compares the desired state of certificates with certificates on the cluster."
+LABEL io.k8s.display-name="CertificatePolicy controller"
+LABEL io.k8s.description="The CertificatePolicy kind compares the desired state of certificates with certificates on the cluster."
+LABEL com.redhat.component="acm-cert-policy-controller-container"
+LABEL io.openshift.tags="data,images"