Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN pip install poetry==$POETRY_VERSION && \
-o /opt/mlserver/dist/constraints.txt && \
sed -i 's/\[.*\]//g' /opt/mlserver/dist/constraints.txt

FROM registry.access.redhat.com/ubi9/ubi-minimal
FROM 724664234782.dkr.ecr.us-east-1.amazonaws.com/docker.io/library/rockylinux:9.3.20231119-minimal
SHELL ["/bin/bash", "-c"]

ARG PYTHON_VERSION=3.10.12
Expand Down Expand Up @@ -91,7 +91,7 @@ COPY --from=wheel-builder /opt/mlserver/dist ./dist
# NOTE: Removing explicitly requirements.txt file from spaCy's test
# dependencies causing false positives in Snyk.
RUN . $CONDA_PATH/etc/profile.d/conda.sh && \
pip install --upgrade pip wheel setuptools && \
pip install --upgrade wheel setuptools && \
if [[ $RUNTIMES == "all" ]]; then \
for _wheel in "./dist/mlserver_"*.whl; do \
if [[ ! $_wheel == *"mllib"* ]]; then \
Expand Down Expand Up @@ -119,6 +119,28 @@ COPY \
./hack/activate-env.sh \
./hack/

#RUN microdnf remove -y python3.9 glib2-devel python-unversioned-command python3-setuptools-wheel python3-libs libX11 libX11-common libX11-xcb libXext mesa-libGL libXfixes libglvnd-glx libXxf86vm
RUN pip install --upgrade certifi tqdm requests urllib3 && pip install --upgrade aiohttp python-multipart starlette
RUN microdnf upgrade -y && microdnf clean all -y

#Remove force remove rpms since these are dependant on microdnf
#RPM uninstall could not find files to uninstall
RUN rpm -e \
# pcre2 \
# pcre2-devel \
# pcre2-syntax \
# pcre2-utf16 \
# pcre2-utf32 \
microdnf \
openldap \
gawk \
tar \
# This is the os version of python certifi which is managed by pip
ca-certificates \
libzstd \
libyaml \
--nodeps

USER 1000

# We need to build and activate the "hot-loaded" environment before MLServer
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = "Seldon Technologies"

# The full version, including alpha/beta/rc tags
release = "1.6.0.dev2"
release = "1.6.1"


# -- General configuration ---------------------------------------------------
Expand Down
49 changes: 49 additions & 0 deletions hack/build-image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/usr/bin/env bash

set -o nounset
set -o errexit
set -o pipefail

ROOT_FOLDER="$(dirname "${0}")/.."
IMAGE_NAME="seldonio/mlserver"

if [ "$#" -ne 2 ]; then
echo 'Invalid number of arguments'
echo "Usage: ./build-images.sh <version> <runtime>"
exit 1
fi

_buildImage() {
local _runtimes=$1
local _tag=$2

DOCKER_BUILDKIT=1 podman build --cgroup-manager cgroupfs $ROOT_FOLDER \
--build-arg RUNTIMES="$_runtimes" \
-t "$IMAGE_NAME:$_tag"
}

_buildRuntimeImage() {
local _runtimePath=$1
local _version=$2
local _runtimeName=$(basename $_runtimePath)

echo "---> Building MLServer runtime image: $_runtimeName"
_buildImage "mlserver-$_runtimeName" "$_version-$_runtimeName"
}

_main() {
local _version=$1
local _runtime=$2

# echo "---> Building core MLServer images"
# _buildImage "all" $_version
# _buildImage "" $_version-slim

for _runtimePath in "$ROOT_FOLDER/runtimes/"*; do
if [[ $_runtimePath == *"$_runtime"* ]]; then
_buildRuntimeImage $_runtimePath $_version
fi
done
}

_main $1 $2
18 changes: 9 additions & 9 deletions licenses/license_info.csv
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@
"mdurl","0.1.2","MIT License"
"ml-dtypes","0.2.0","Apache Software License"
"mlflow","2.13.1","Apache Software License"
"mlserver","1.6.0.dev2","Apache Software License"
"mlserver-alibi-detect","1.6.0.dev2","Apache Software License"
"mlserver-alibi-explain","1.6.0.dev2","Apache Software License"
"mlserver-catboost","1.6.0.dev2","Apache Software License"
"mlserver-huggingface","1.6.0.dev2","Apache Software License"
"mlserver-lightgbm","1.6.0.dev2","Apache Software License"
"mlserver-mlflow","1.6.0.dev2","Apache Software License"
"mlserver-sklearn","1.6.0.dev2","Apache Software License"
"mlserver-xgboost","1.6.0.dev2","Apache Software License"
"mlserver","1.6.1","Apache Software License"
"mlserver-alibi-detect","1.6.1","Apache Software License"
"mlserver-alibi-explain","1.6.1","Apache Software License"
"mlserver-catboost","1.6.1","Apache Software License"
"mlserver-huggingface","1.6.1","Apache Software License"
"mlserver-lightgbm","1.6.1","Apache Software License"
"mlserver-mlflow","1.6.1","Apache Software License"
"mlserver-sklearn","1.6.1","Apache Software License"
"mlserver-xgboost","1.6.1","Apache Software License"
"mpmath","1.3.0","BSD License"
"multidict","6.0.5","Apache Software License"
"multiprocess","0.70.16","BSD License"
Expand Down
2 changes: 1 addition & 1 deletion mlserver/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.6.0.dev2"
__version__ = "1.6.1"
Loading
Loading