Merge pull request #86 from spolti/sync

Sync 'Kserve/main' into 'ODH/main'

Author: spolti

Dockerfile

@@ -25,11 +25,12 @@ USER root
 ENV HOME=/root
 
 # Install build and dev tools
-# NOTE: Require python38 to install pre-commit
+# NOTE: Require python311 to install pre-commit
 RUN --mount=type=cache,target=/root/.cache/dnf:rw \
     dnf install --setopt=cachedir=/root/.cache/dnf -y --nodocs \
         nodejs \
-        python38 \
+        python3.11 \
+        python3.11-pip \
     && ln -sf /usr/bin/python3 /usr/bin/python \
     && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && true
@@ -158,8 +159,9 @@ RUN --mount=type=cache,target=/root/.cache/microdnf:rw \
     microdnf install --setopt=cachedir=/root/.cache/microdnf --setopt=ubi-8-appstream-rpms.module_hotfixes=1 \
        gcc \
        gcc-c++ \
-       python38-devel \
-       python38 \
+       python3.11-devel \
+       python3.11 \
+       python3.11-pip \
     && ln -sf /usr/bin/python3 /usr/bin/python \
     && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && true

Makefile

@@ -15,9 +15,6 @@
 # make builder configurable, default to docker.
 ENGINE ?= docker
 
-# make builder configurable, default to docker.
-ENGINE ?= docker
-
 # collect args from `make run` so that they don't run twice
 ifeq (run,$(firstword $(MAKECMDGOALS)))
   RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
@@ -33,7 +30,7 @@ all: build
 .PHONY: build
 ## Build runtime container image
 build:
-	ENGINE=${ENGINE} && ./scripts/build_docker.sh --target builder --target runtime
+	ENGINE=${ENGINE} && ./scripts/build_docker.sh --target runtime
 
 .PHONY: build.develop
 ## Build developer container image

model-mesh-triton-adapter/scripts/tf_pb.py

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import os
 import sys
 import time