UNCLASSIFIED

You need to sign in or sign up before continuing.
Commit 9d4f2414 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

Development

See merge request !18
parents 2fb63445 69606b4c
Pipeline #265364 failed with stages
in 20 minutes and 43 seconds
......@@ -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-py:2.4.4 as base
FROM spark-operator/spark-py:2.4.5 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
......@@ -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:
- "2.4.4"
- "v2.4.5"
- "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: "2.4.4"
org.opencontainers.image.version: "v2.4.5"
# 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-py@sha256:f4980fb33077ae6e03329cf6f835ec671c1b99de391ef9494e28ed19cf3de298"
tag: "spark-operator/spark-py:2.4.4"
- url: "docker://gcr.io/spark-operator/spark-py@sha256:c1f21b8b6f4f0ad7b25177ad086b7eaf7d96747940b0fe2e8dc6ca688c85db76"
tag: "spark-operator/spark-py:2.4.5"
- 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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment