Parametrized docker build (kubeflow#2666)

Signed-off-by: Peter Ableda <abledapeter@gmail.com>
magdalenakuhn17 · Apr 1, 2023 · 774f0c4 · 774f0c4
1 parent 8da610b
commit 774f0c4
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 24 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,10 @@
 HAS_LINT := $(shell command -v golint;)
 
+# Base Image URL
+BASE_IMG ?= python:3.9-slim-bullseye
+AIX_BASE_IMG ?= python:3.7-slim
+PMML_BASE_IMG ?= openjdk:11-slim
+
 # Image URL to use all building/pushing image targets
 IMG ?= kserve-controller:latest
 AGENT_IMG ?= agent:latest
@@ -219,49 +224,49 @@ docker-push-router:
 	docker push ${KO_DOCKER_REPO}/${ROUTER_IMG}
 
 docker-build-sklearn:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${SKLEARN_IMG} -f sklearn.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${SKLEARN_IMG} -f sklearn.Dockerfile .
 
 docker-push-sklearn: docker-build-sklearn
 	docker push ${KO_DOCKER_REPO}/${SKLEARN_IMG}
 
 docker-build-xgb:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${XGB_IMG} -f xgb.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${XGB_IMG} -f xgb.Dockerfile .
 
 docker-push-xgb: docker-build-xgb
 	docker push ${KO_DOCKER_REPO}/${XGB_IMG}
 
 docker-build-lgb:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${LGB_IMG} -f lgb.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${LGB_IMG} -f lgb.Dockerfile .
 
 docker-push-lgb: docker-build-lgb
 	docker push ${KO_DOCKER_REPO}/${LGB_IMG}
 
 docker-build-pmml:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${PMML_IMG} -f pmml.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${PMML_BASE_IMG} -t ${KO_DOCKER_REPO}/${PMML_IMG} -f pmml.Dockerfile .
 
 docker-push-pmml: docker-build-pmml
 	docker push ${KO_DOCKER_REPO}/${PMML_IMG}
 
 docker-build-paddle:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${PADDLE_IMG} -f paddle.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${PADDLE_IMG} -f paddle.Dockerfile .
 
 docker-push-paddle: docker-build-paddle
 	docker push ${KO_DOCKER_REPO}/${PADDLE_IMG}
 
 docker-build-alibi:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${ALIBI_IMG} -f alibiexplainer.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${ALIBI_IMG} -f alibiexplainer.Dockerfile .
 
 docker-push-alibi: docker-build-alibi
 	docker push ${KO_DOCKER_REPO}/${ALIBI_IMG}
 
 docker-build-aix:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${AIX_IMG} -f aixexplainer.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${AIX_BASE_IMG} -t ${KO_DOCKER_REPO}/${AIX_IMG} -f aixexplainer.Dockerfile .
 
 docker-push-aix: docker-build-aix
 	docker push ${KO_DOCKER_REPO}/${AIX_IMG}
 
 docker-build-storageInitializer:
-	cd python && docker build -t ${KO_DOCKER_REPO}/${STORAGE_INIT_IMG} -f storage-initializer.Dockerfile .
+	cd python && docker build --build-arg BASE_IMAGE=${BASE_IMG} -t ${KO_DOCKER_REPO}/${STORAGE_INIT_IMG} -f storage-initializer.Dockerfile .
 
 docker-push-storageInitializer: docker-build-storageInitializer
 	docker push ${KO_DOCKER_REPO}/${STORAGE_INIT_IMG}

diff --git a/python/aiffairness.Dockerfile b/python/aiffairness.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/aixexplainer.Dockerfile b/python/aixexplainer.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.7-slim
+ARG BASE_IMAGE=python:3.7-slim
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/alibiexplainer.Dockerfile b/python/alibiexplainer.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/artexplainer.Dockerfile b/python/artexplainer.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/custom_model.Dockerfile b/python/custom_model.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 
@@ -7,7 +8,7 @@ COPY VERSION VERSION
 RUN pip install --no-cache-dir --upgrade pip && pip install --no-cache-dir -e ./kserve
 
 COPY custom_model custom_model
-RUN pip install -r ./custom_model/requirements.txt 
+RUN pip install -r ./custom_model/requirements.txt
 
 RUN useradd kserve -m -u 1000 -d /home/kserve
 USER 1000

diff --git a/python/custom_model_grpc.Dockerfile b/python/custom_model_grpc.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/custom_transformer.Dockerfile b/python/custom_transformer.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/custom_transformer_grpc.Dockerfile b/python/custom_transformer_grpc.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/lgb.Dockerfile b/python/lgb.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/paddle.Dockerfile b/python/paddle.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/pmml.Dockerfile b/python/pmml.Dockerfile
@@ -1,4 +1,5 @@
-FROM openjdk:11-slim
+ARG BASE_IMAGE=openjdk:11-slim
+FROM $BASE_IMAGE
 
 ARG PYTHON_VERSION=3.9
 ARG CONDA_PYTHON_VERSION=3

diff --git a/python/sklearn.Dockerfile b/python/sklearn.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party
 

diff --git a/python/storage-initializer.Dockerfile b/python/storage-initializer.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -12,7 +13,7 @@ RUN apt-get update && apt-get install -y \
     gcc \
     libkrb5-dev \
     krb5-config \
- && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
 RUN pip install --no-cache-dir krbcontext==0.10 hdfs~=2.6.0 requests-kerberos==0.14.0
 

diff --git a/python/xgb.Dockerfile b/python/xgb.Dockerfile
@@ -1,4 +1,5 @@
-FROM python:3.9-slim-bullseye
+ARG BASE_IMAGE=python:3.9-slim-bullseye
+FROM $BASE_IMAGE
 
 COPY third_party third_party