Merge pull request #473 from devcoons/main

Update Makefile: Add OS dependant generation of date, selection of proper cmd to locate container engine and automatically select available container engine

Author: harshad16

Makefile

@@ -1,7 +1,15 @@
-CONTAINER_ENGINE ?= podman
 IMAGE_REGISTRY   ?= quay.io/opendatahub/workbench-images
 RELEASE	 		 ?= 2023b
-DATE 			 ?= $(shell date +'%Y%m%d')
+
+# OS dependant: Generate date, select appropriate cmd to locate container engine
+ifeq ($(OS), Windows_NT)
+	DATE 		?= $(shell powershell -Command "Get-Date -Format 'yyyyMMdd'")
+	WHERE_WHICH ?= where
+else
+	DATE 		?= $(shell date +'%Y%m%d')
+	WHERE_WHICH ?= which
+endif
+
 IMAGE_TAG		 ?= $(RELEASE)_$(DATE)
 KUBECTL_BIN      ?= bin/kubectl
 KUBECTL_VERSION  ?= v1.23.11
@@ -10,6 +18,16 @@ REQUIRED_RUNTIME_IMAGE_COMMANDS="curl python3"
 REQUIRED_CODE_SERVER_IMAGE_COMMANDS="curl python oc code-server"
 REQUIRED_R_STUDIO_IMAGE_COMMANDS="curl python oc /usr/lib/rstudio-server/bin/rserver"
 
+# Detect and select the system's available container engine
+ifeq (, $(shell $(WHERE_WHICH) podman))
+	DOCKER := $(shell $(WHERE_WHICH) docker)
+	ifeq (, $(DOCKER))
+		$(error "Neither Docker nor Podman is installed. Please install one of them.")
+	endif
+	CONTAINER_ENGINE := docker
+else
+	CONTAINER_ENGINE := podman
+endif
 
 # Build function for the notebok image:
 #   ARG 1: Image tag name.

intel/runtimes/pytorch/ubi9-python-3.9/Dockerfile

@@ -44,8 +44,8 @@ ENV CPU_ENV=/opt/app-root-cpu
 COPY --chown=1001:0 Pipfile.lock.cpu ${CPU_ENV}/Pipfile.lock
 
 #CPU env
-RUN cd ${CPU_ENV} && \
-    python3.9 -m venv ${CPU_ENV} && \
+WORKDIR ${CPU_ENV}
+RUN python3.9 -m venv ${CPU_ENV} && \
     chown -R 1001:0 ${CPU_ENV} && \
     fix-permissions ${CPU_ENV} -P && \
     source ${CPU_ENV}/bin/activate && \

intel/runtimes/tensorflow/ubi9-python-3.9/Dockerfile

@@ -47,8 +47,8 @@ ENV CPU_ENV=/opt/app-root-cpu
 COPY --chown=1001:0 Pipfile.lock.cpu ${CPU_ENV}/Pipfile.lock
 
 #CPU env
-RUN cd ${CPU_ENV} && \
-    python3.9 -m venv ${CPU_ENV} && \
+WORKDIR ${CPU_ENV}
+RUN python3.9 -m venv ${CPU_ENV} && \
     chown -R 1001:0 ${CPU_ENV} && \
     fix-permissions ${CPU_ENV} -P && \
     unlink ${CPU_ENV}/lib64 && \

jupyter/intel/pytorch/ubi9-python-3.9/Dockerfile

@@ -34,8 +34,8 @@ COPY --chown=1001:0 utils /opt/app-root/bin/utils
 #CPU env
 COPY --chown=1001:0 Pipfile.lock.cpu ${CPU_ENV}/Pipfile.lock
 
-RUN cd ${CPU_ENV} && \
-    source ${CPU_ENV}/bin/activate && \
+WORKDIR ${CPU_ENV} 
+RUN source ${CPU_ENV}/bin/activate && \
     micropipenv install && \
     rm -f ./Pipfile.lock && \
     python -m ipykernel install --prefix=/opt/app-root --name 'pytorch-cpu' --display-name='pytorch-cpu' && \

jupyter/intel/tensorflow/ubi9-python-3.9/Dockerfile

@@ -34,8 +34,8 @@ COPY --chown=1001:0 utils /opt/app-root/bin/utils
 #CPU env
 COPY --chown=1001:0 Pipfile.lock.cpu ${CPU_ENV}/Pipfile.lock
 
-RUN cd ${CPU_ENV} && \
-    source ${CPU_ENV}/bin/activate && \
+WORKDIR ${CPU_ENV}
+RUN source ${CPU_ENV}/bin/activate && \
     micropipenv install && \
     rm -f ./Pipfile.lock && \
     python -m ipykernel install --prefix=/opt/app-root --name 'tensorflow-cpu' --display-name='tensorflow-cpu' && \