diff --git a/Dockerfile b/Dockerfile index 9965846ad2df79e9bb12bb2b1240a3f706f2b89a..8496894d4e1c9522462c98509e168da44f814ded 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=repo1.dso.mil ARG BASE_IMAGE=ironbank/opensource/python/python38 ARG BASE_TAG=3.8 -FROM spark-operator/spark-operator:v1beta2-1.0.0-2.4.4 as base +FROM spark-operator/spark-py:2.4.4 as base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index b4a43ad939baa3f0835c5c795fab91cc9f8c2a6c..083e54c2ed53a20c429b4eba0dd62d8e7b6ea06e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "opensource/spark-operator/spark-py" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "v1beta2-1.0.0-2.4.4" +- "2.4.4" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://spark.apache.org/docs/latest/index.html" # Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Apache Software Foundation" - org.opencontainers.image.version: "v1beta2-1.0.0-2.4.4" + org.opencontainers.image.version: "2.4.4" # Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "apache,python,data processing,large scale,hadoop,kubeflow" # This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: - - url: "docker://gcr.io/spark-operator/spark-operator@sha256:52b257911a5c47c480aae25f83c80151a2ed8c99e8b50317d451c157c80666fd" - tag: "spark-operator/spark-operator:v1beta2-1.0.0-2.4.4" + - url: "gcr.io/spark-operator/spark-py@sha256:f4980fb33077ae6e03329cf6f835ec671c1b99de391ef9494e28ed19cf3de298" + tag: "spark-operator/spark-py:2.4.4" - filename: pip-21.0.1-py3-none-any.whl url: https://files.pythonhosted.org/packages/fe/ef/60d7ba03b5c442309ef42e7d69959f73aacccd0d86008362a681c4698e83/pip-21.0.1-py3-none-any.whl validation: