From 7241d6a289200f5ff29fdb8ffe296bf09803bf54 Mon Sep 17 00:00:00 2001 From: David Wood Date: Thu, 26 Sep 2024 10:52:10 -0400 Subject: [PATCH] set spark base image tag to that from .make.versions (#626) * set spark base image tag to that from .make.versions Signed-off-by: David Wood * have spark transform images all use latest by default Signed-off-by: David Wood * restore default spark FROM image to include quay.io Signed-off-by: David Wood --------- Signed-off-by: David Wood --- data-processing-lib/spark/Makefile | 1 - transforms/universal/doc_id/spark/Dockerfile | 2 +- transforms/universal/filter/spark/Dockerfile | 2 +- transforms/universal/noop/spark/Dockerfile | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data-processing-lib/spark/Makefile b/data-processing-lib/spark/Makefile index d4d01ba74..51290ccf5 100644 --- a/data-processing-lib/spark/Makefile +++ b/data-processing-lib/spark/Makefile @@ -4,7 +4,6 @@ include $(REPOROOT)/.make.defaults SPARK_VERSION=3.5.2 DOCKER_IMAGE_NAME=data-prep-kit-spark-$(SPARK_VERSION) DOCKER_IMAGE_LIB_NAME=data-prep-kit-spark -DOCKER_IMAGE_VERSION := latest .check-env:: diff --git a/transforms/universal/doc_id/spark/Dockerfile b/transforms/universal/doc_id/spark/Dockerfile index 2b529de8d..dc8f5faf3 100644 --- a/transforms/universal/doc_id/spark/Dockerfile +++ b/transforms/universal/doc_id/spark/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:0.2.1.dev0 +ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:latest FROM ${BASE_IMAGE} USER root diff --git a/transforms/universal/filter/spark/Dockerfile b/transforms/universal/filter/spark/Dockerfile index 92eebbee8..8131c8d07 100644 --- a/transforms/universal/filter/spark/Dockerfile +++ b/transforms/universal/filter/spark/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:0.2.1.dev0 +ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:latest FROM ${BASE_IMAGE} USER root diff --git a/transforms/universal/noop/spark/Dockerfile b/transforms/universal/noop/spark/Dockerfile index e72cb06ae..deb54f974 100644 --- a/transforms/universal/noop/spark/Dockerfile +++ b/transforms/universal/noop/spark/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:0.2.1.dev0 +ARG BASE_IMAGE=quay.io/dataprep1/data-prep-kit/data-prep-kit-spark-3.5.2:latest FROM ${BASE_IMAGE} USER root