pull from kubeflow/spark-operator and pull from IB

Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk17-runtime-ubi9-slim
-ARG BASE_TAG=1.17
+ARG BASE_IMAGE=ironbank/opensource/alpinelinux/alpine
+ARG BASE_TAG=3.20.2
+
+FROM kubeflow/spark-operator:2.0.0-rc.0 AS base
+FROM registry1.dso.mil/ironbank/opensource/spark-operator/spark-py:3.5.1 AS spark
 
-FROM ghcr.io/googlecloudplatform/spark-operator:v1beta2-1.3.8-3.1.1 as base
-FROM apache/spark:3.4.1 as spark
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 ENV SPARK_HOME=/opt/spark
-
 USER root
 
-RUN microdnf install -y openssl shadow
-RUN microdnf upgrade -y && \
-    microdnf clean all && \
-    rm -rf /var/cache/dnf
+ARG JAVA_VERSION
+ENV JAVA_VERSION=${JAVA_VERSION:-17}
+# Install python and tools
+RUN apk upgrade --no-cache --update \
+    && apk add --no-cache openjdk${JAVA_VERSION} \
+    && apk update && apk add --no-cache shadow \
+    && apk add --no-cache bash 
+
 COPY --from=base /usr/bin/spark-operator /usr/bin/
 COPY --from=spark /opt/spark /opt/spark/
 
@@ -37,6 +41,7 @@ COPY scripts/oscap-fixes/*.sh /oscap-fixes/
 RUN /oscap-fixes/xccdf_org.ssgproject.content_rule_file_ownership_binary_dirs.sh && \
     /oscap-fixes/xccdf_org.ssgproject.content_rule_file_permissions_binary_dirs.sh
 
+RUN rm -rf /var/cache/apk/*
 USER spark-operator
 
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]

hardening_manifest.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 name: spark-operator/spark-operator
 
 tags:
-- v1beta2-1.3.8-3.4.1
+- 2.0.0-rc.0
 - latest
 
 args:
@@ -14,18 +14,18 @@ labels:
   org.opencontainers.image.title: Spark Operator
   org.opencontainers.image.description: spark-operator controller based on UBI 8
   org.opencontainers.image.licenses: Apache-2.0
-  org.opencontainers.image.url: ghcr.io/googlecloudplatform/spark-operator@sha256:461336fa7e91c5127f29c06143400a911daf0bdbae2b3bea917cbd5cff0c6c3b
+  org.opencontainers.image.url: kubeflow/spark-operator:2.0.0-rc.0@sha256:a789f9f145c5099b41641e31f695feb43dbc018b29e507f615131670abad404a
   org.opencontainers.image.vendor: spark-operator
-  org.opencontainers.image.version: v1beta2-1.3.8-3.1.1
-  mil.dso.ironbank.image.keywords: spark,spark-operator,v1beta2-1.3.8-3.4.1
+  org.opencontainers.image.version: 2.0.0-rc.0
+  mil.dso.ironbank.image.keywords: spark,spark-operator,2.0.0-rc.0
   mil.dso.ironbank.image.type: opensource
   mil.dso.ironbank.product.name: kubeflow
 
 resources:
-- tag: ghcr.io/googlecloudplatform/spark-operator:v1beta2-1.3.8-3.1.1
-  url: docker://ghcr.io/googlecloudplatform/spark-operator@sha256:461336fa7e91c5127f29c06143400a911daf0bdbae2b3bea917cbd5cff0c6c3b
-- tag: docker.io/apache/spark:3.4.1
-  url: docker://docker.io/apache/spark@sha256:a1dd2487a97fb5e35c5a5b409e830b501a92919029c62f9a559b13c4f5c50f63
+- tag: kubeflow/spark-operator:2.0.0-rc
+  url: https://hub.docker.com/layers/kubeflow/spark-operator/2.0.0-rc.0/images/sha256-a789f9f145c5099b41641e31f695feb43dbc018b29e507f615131670abad404a?context=explore
+- tag: registry1.dso.mil/ironbank/opensource/spark-operator/spark-py:3.5.1
+  url: https://ironbank.dso.mil/repomap/details;registry1Path=opensource%252Fspark-operator%252Fspark-py
 - url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64
   filename: tini
   validation: