From 25ff5da27fe5c65c4c143bd4e4d00b17771e0033 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Mon, 22 Feb 2021 15:23:27 +0000 Subject: [PATCH 01/10] Use new version of the JNI image --- testing/scripts/test_s2i_java.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/scripts/test_s2i_java.py b/testing/scripts/test_s2i_java.py index a8cee30ada..0e86a53f5b 100644 --- a/testing/scripts/test_s2i_java.py +++ b/testing/scripts/test_s2i_java.py @@ -12,9 +12,9 @@ S2I_JNI_PARAMETERS = { "s2i_folder": JAVA_S2I_FOLDER, - "s2i_image": "seldonio/s2i-java-jni-build:0.4.0", + "s2i_image": "seldonio/s2i-java-jni-build:0.5.0", "image_name": "seldonio/test-s2i-java-jni:0.2.0", - "s2i_runtime_image": "seldonio/s2i-java-jni-runtime:0.4.0", + "s2i_runtime_image": "seldonio/s2i-java-jni-runtime:0.5.0", } S2I_JAVA_PARAMETERS = { From 5c6d14c45283d5aea84edd8a0f8c7fd12281edbe Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Mon, 22 Feb 2021 15:23:52 +0000 Subject: [PATCH 02/10] Change base image of build image --- incubating/wrappers/s2i/java-jni/Dockerfile.build | 2 +- incubating/wrappers/s2i/java-jni/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incubating/wrappers/s2i/java-jni/Dockerfile.build b/incubating/wrappers/s2i/java-jni/Dockerfile.build index c31a566ed5..4ae101d502 100644 --- a/incubating/wrappers/s2i/java-jni/Dockerfile.build +++ b/incubating/wrappers/s2i/java-jni/Dockerfile.build @@ -1,4 +1,4 @@ -FROM seldonio/core-builder:0.16 +FROM maven:3.6.3-jdk-13 LABEL io.openshift.s2i.scripts-url="image:///s2i/bin" diff --git a/incubating/wrappers/s2i/java-jni/Makefile b/incubating/wrappers/s2i/java-jni/Makefile index 91327d914b..afb1bb7a2c 100644 --- a/incubating/wrappers/s2i/java-jni/Makefile +++ b/incubating/wrappers/s2i/java-jni/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash SELDON_CORE_DIR = ../../../.. -VERSION := 0.4.0 +VERSION := 0.5.0 IMAGE_REGISTRY = docker.io/seldonio IMAGE_NAME_BUILD = ${IMAGE_REGISTRY}/s2i-java-jni-build:${VERSION} IMAGE_NAME_RUNTIME = ${IMAGE_REGISTRY}/s2i-java-jni-runtime:${VERSION} From 026456035f8fce15e42d186dcdc1a0ab101812da Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Mon, 22 Feb 2021 17:23:05 +0000 Subject: [PATCH 03/10] Update docs with new version --- doc/source/java-jni/README.md | 16 ++++++++-------- .../java-jni/test/model-template-app/Makefile | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/java-jni/README.md b/doc/source/java-jni/README.md index 9e8e5ce24b..be784067f5 100644 --- a/doc/source/java-jni/README.md +++ b/doc/source/java-jni/README.md @@ -25,7 +25,7 @@ s2i](../wrappers/s2i.md) and then follow the steps below. To check everything is working you can run ```bash -s2i usage seldonio/s2i-java-jni-build:0.3.0 +s2i usage seldonio/s2i-java-jni-build:0.5.0 ``` ## Step 2 - Create your source code @@ -153,8 +153,8 @@ The general format is: ```bash s2i build \ \ - seldonio/s2i-java-jni-build:0.3.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.3.0 \ + seldonio/s2i-java-jni-build:0.5.0 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ ``` @@ -164,8 +164,8 @@ An example invocation using the test template model inside `seldon-core`: s2i build \ https://github.com/seldonio/seldon-core.git \ --context-dir=incubating/wrappers/s2i/java-jni/test/model-template-app \ - seldonio/s2i-java-jni-build:0.3.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.3.0 \ + seldonio/s2i-java-jni-build:0.5.0 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ jni-model-template:0.1.0 ``` @@ -186,15 +186,15 @@ git clone https://github.com/seldonio/seldon-core.git cd seldon-core s2i build \ incubating/wrappers/s2i/java-jni/test/model-template-app \ - seldonio/s2i-java-jni-build:0.3.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.3.0 \ + seldonio/s2i-java-jni-build:0.5.0 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ jni-model-template:0.1.0 ``` For more help see: ```bash -s2i usage seldonio/s2i-java-jni-build:0.3.0 +s2i usage seldonio/s2i-java-jni-build:0.5.0 s2i build --help ``` diff --git a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile index 66ad429375..e1c0399bcc 100644 --- a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile +++ b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile @@ -7,8 +7,8 @@ build_jar: build: s2i build . \ - seldonio/s2i-java-jni-build:0.3.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.3.0 \ + seldonio/s2i-java-jni-build:0.5.0 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ ${IMAGE} run: From 1a5324539609a3b6d687b635857620df004af314 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 12:22:00 +0000 Subject: [PATCH 04/10] Move images to ubi8 --- .../wrappers/s2i/java-jni/Dockerfile.build | 4 +- .../wrappers/s2i/java-jni/Dockerfile.runtime | 72 ++++++++----------- incubating/wrappers/s2i/java-jni/Makefile | 3 +- .../s2i/java-jni/s2i/bin/assemble-runtime | 2 +- 4 files changed, 35 insertions(+), 46 deletions(-) diff --git a/incubating/wrappers/s2i/java-jni/Dockerfile.build b/incubating/wrappers/s2i/java-jni/Dockerfile.build index 4ae101d502..3479012f1d 100644 --- a/incubating/wrappers/s2i/java-jni/Dockerfile.build +++ b/incubating/wrappers/s2i/java-jni/Dockerfile.build @@ -1,7 +1,5 @@ -FROM maven:3.6.3-jdk-13 +FROM registry.access.redhat.com/ubi8/openjdk-11 LABEL io.openshift.s2i.scripts-url="image:///s2i/bin" COPY ./s2i/bin/ /s2i/bin - -WORKDIR /build diff --git a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime index 5654bb388c..a83f360488 100644 --- a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime +++ b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime @@ -1,57 +1,47 @@ -FROM openjdk:13.0.1-jdk-buster - -ENV PYTHON_VERSION "3.6.10" - -# Compression and SSL libs required for installing Python -RUN apt-get upgrade && \ - apt-get update && \ - apt-get install build-essential -y && \ - apt-get install zlib1g -y && \ - apt-get install zlib1g-dev -y && \ - apt-get install libssl-dev -y && \ - apt-get install libbz2-dev -y && \ - apt-get install liblzma-dev -y - -# Build and install Python -RUN curl -SLO https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz \ - && tar xvf Python-${PYTHON_VERSION}.tgz \ - && cd Python-${PYTHON_VERSION} \ - && ./configure --prefix=/usr/local --with-openssl \ - && make \ - && make altinstall \ - && cd / \ - && rm -rf Python-${PYTHON_VERSION}* \ - && (cd /usr/local/bin && ln -svn python3.6 python) - -# Ensure python3 and pip3 are default -RUN curl -sS https://bootstrap.pypa.io/get-pip.py >>setup.py && \ - python setup.py -RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.6 1 -RUN rm -rf /usr/local/bin/pip && \ - ln -s /usr/local/bin/pip3.6 /usr/local/bin/pip +FROM registry.access.redhat.com/ubi8/python-36 -RUN pip install --upgrade pip setuptools wheel +# NOTE: This Dockerfile installs OpenJDK on top of the Python UBI image. +# This is required for the JNI runtime. + +LABEL io.openshift.s2i.scripts-url="image:///s2i/bin" \ + io.openshift.s2i.assemble-input-files="/build" + +# Get privileges to install Java +USER root + +# Install OpenJDK (same version as Dockerfile.build) +ENV JAVA_MAJOR_VERSION=11 \ + JAVA_HOME=/usr/lib/jvm/jre-11 -RUN mkdir /build +RUN INSTALL_PKGS="java-11-openjdk-headless" && \ + yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ + rpm -V $INSTALL_PKGS && \ + yum -y clean all --enablerepo='*' -LABEL io.openshift.s2i.scripts-url="image:///s2i/bin" -LABEL io.openshift.s2i.assemble-input-files="/build" +# Security upgrades +RUN yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical + +# CVE https://github.com/SeldonIO/seldon-core/issues/2960 +RUN yum remove -y nodejs httpd + +# Drop root and continue +USER default COPY ./s2i/bin/ /s2i/bin -WORKDIR /microservice +RUN pip install --upgrade pip setuptools wheel # Install Seldon Core -COPY _python /microservice -RUN cd /microservice/python && make install -COPY _python/python/licenses/license.txt . +COPY --chown=1001 _python . +RUN make -C python install +COPY --chown=1001 _python/python/licenses/license.txt . # Install extra requirements for the JNI server -COPY ./java-jni/requirements.txt ./requirements.txt +COPY --chown=1001 ./java-jni/requirements.txt ./requirements.txt RUN pip install -r requirements.txt # Copy JNI server -COPY ./java-jni ./ +COPY --chown=1001 ./java-jni ./ EXPOSE 5000 diff --git a/incubating/wrappers/s2i/java-jni/Makefile b/incubating/wrappers/s2i/java-jni/Makefile index afb1bb7a2c..87022dba99 100644 --- a/incubating/wrappers/s2i/java-jni/Makefile +++ b/incubating/wrappers/s2i/java-jni/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash SELDON_CORE_DIR = ../../../.. -VERSION := 0.5.0 +VERSION := 0.5.1 IMAGE_REGISTRY = docker.io/seldonio IMAGE_NAME_BUILD = ${IMAGE_REGISTRY}/s2i-java-jni-build:${VERSION} IMAGE_NAME_RUNTIME = ${IMAGE_REGISTRY}/s2i-java-jni-runtime:${VERSION} @@ -9,6 +9,7 @@ IMAGE_NAME_RUNTIME = ${IMAGE_REGISTRY}/s2i-java-jni-runtime:${VERSION} get_local_repo: mkdir -p _python cp -r $(SELDON_CORE_DIR)/python _python + cp $(SELDON_CORE_DIR)/version.txt _python/version.txt .PHONY: build build: get_local_repo diff --git a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime index 4544cdc54f..245acb1367 100755 --- a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime +++ b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime @@ -8,6 +8,6 @@ # # Move jar binary with inference runtime implementation -mv /microservice/build/target/*.jar /microservice/model.jar +mv ./build/target/*.jar ./model.jar From 8db219fa70f5e8d0bcaeacf2611c480f64043e8b Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 12:47:53 +0000 Subject: [PATCH 05/10] Update images and tests --- incubating/wrappers/s2i/java-jni/Dockerfile.runtime | 2 +- incubating/wrappers/s2i/java-jni/s2i/bin/assemble | 4 ---- testing/scripts/test_s2i_java.py | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime index a83f360488..6858fc2031 100644 --- a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime +++ b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime @@ -24,7 +24,7 @@ RUN yum -y update-minimal --security --sec-severity=Important --sec-severity=Cri # CVE https://github.com/SeldonIO/seldon-core/issues/2960 RUN yum remove -y nodejs httpd -# Drop root and continue +# Drop root and continue (base image uses 1001) USER default COPY ./s2i/bin/ /s2i/bin diff --git a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble index 13f18cdf8d..b08aee4b32 100755 --- a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble +++ b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble @@ -18,10 +18,6 @@ if [[ -z "$SERVICE_TYPE" ]]; then exit 1 fi - - -cd /build - echo "---> Installing application source..." cp -Rf /tmp/src/. ./ diff --git a/testing/scripts/test_s2i_java.py b/testing/scripts/test_s2i_java.py index 0e86a53f5b..d22d0b854a 100644 --- a/testing/scripts/test_s2i_java.py +++ b/testing/scripts/test_s2i_java.py @@ -12,9 +12,9 @@ S2I_JNI_PARAMETERS = { "s2i_folder": JAVA_S2I_FOLDER, - "s2i_image": "seldonio/s2i-java-jni-build:0.5.0", + "s2i_image": "seldonio/s2i-java-jni-build:0.5.1", "image_name": "seldonio/test-s2i-java-jni:0.2.0", - "s2i_runtime_image": "seldonio/s2i-java-jni-runtime:0.5.0", + "s2i_runtime_image": "seldonio/s2i-java-jni-runtime:0.5.1", } S2I_JAVA_PARAMETERS = { From 2331031eb47b0d10e3c849dd2e324ad0407573e1 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 12:56:09 +0000 Subject: [PATCH 06/10] Set Java version to JDK 1.11 (for compatibility with UBI8 images) --- incubating/wrappers/java/pom.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/incubating/wrappers/java/pom.xml b/incubating/wrappers/java/pom.xml index 1171341883..6b0bdcbbf8 100644 --- a/incubating/wrappers/java/pom.xml +++ b/incubating/wrappers/java/pom.xml @@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs io.seldon.wrapper seldon-core-wrapper jar - 0.3.0 + 0.4.1 Seldon Core Java Wrapper http://maven.apache.org Wrapper for seldon-core Java prediction models. @@ -48,9 +48,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 2.2.4.RELEASE - 13 - 13 - 13 + + 11 + 11 UTF-8 @@ -98,10 +98,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-compiler-plugin - 3.5.1 + 3.8.1 - 13 - 13 UTF-8 true From f20197897c9059c0cf5bd93b1f8a84c7e3db1ec8 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 13:16:34 +0000 Subject: [PATCH 07/10] Update pom.xml of test --- testing/s2i/java/pom.xml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/testing/s2i/java/pom.xml b/testing/s2i/java/pom.xml index 43d6a29961..65e527e860 100644 --- a/testing/s2i/java/pom.xml +++ b/testing/s2i/java/pom.xml @@ -6,13 +6,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs io.seldon.example seldon-core-model-template jar - 0.3.0-SNAPSHOT + 0.4.0-SNAPSHOT Seldon Core Model Template http://maven.apache.org - 13 - 13 - 13 + 11 + 11 UTF-8 @@ -31,10 +30,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-compiler-plugin - 3.5.1 + 3.8.1 - 13 - 13 UTF-8 @@ -63,7 +60,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs io.seldon.wrapper seldon-core-wrapper - 0.3.0 + 0.4.1 From e0b5962cca5e059b882a0bcc59eb9a562af9cc68 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 13:19:38 +0000 Subject: [PATCH 08/10] Update label --- incubating/wrappers/s2i/java-jni/Dockerfile.runtime | 2 +- .../s2i/java-jni/test/model-template-app/Makefile | 4 ++-- .../s2i/java-jni/test/model-template-app/pom.xml | 11 ++++------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime index 6858fc2031..4deea3202a 100644 --- a/incubating/wrappers/s2i/java-jni/Dockerfile.runtime +++ b/incubating/wrappers/s2i/java-jni/Dockerfile.runtime @@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi8/python-36 # This is required for the JNI runtime. LABEL io.openshift.s2i.scripts-url="image:///s2i/bin" \ - io.openshift.s2i.assemble-input-files="/build" + io.openshift.s2i.assemble-input-files="/home/jboss" # Get privileges to install Java USER root diff --git a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile index e1c0399bcc..9ee872f832 100644 --- a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile +++ b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile @@ -7,8 +7,8 @@ build_jar: build: s2i build . \ - seldonio/s2i-java-jni-build:0.5.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ + seldonio/s2i-java-jni-build:0.5.1 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.1 \ ${IMAGE} run: diff --git a/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml b/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml index 43d6a29961..06eec2c950 100644 --- a/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml +++ b/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml @@ -6,13 +6,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs io.seldon.example seldon-core-model-template jar - 0.3.0-SNAPSHOT + 0.4.0-SNAPSHOT Seldon Core Model Template http://maven.apache.org - 13 - 13 - 13 + 11 + 11 UTF-8 @@ -33,8 +32,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-compiler-plugin 3.5.1 - 13 - 13 UTF-8 @@ -63,7 +60,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs io.seldon.wrapper seldon-core-wrapper - 0.3.0 + 0.4.1 From 2f3bcacb6e01e922221999331461eb263c14c0b4 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 15:11:13 +0000 Subject: [PATCH 09/10] Upgrade s2i paths after moving to ubi8 images --- incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime | 2 +- incubating/wrappers/s2i/java-jni/s2i/bin/run | 4 +--- .../wrappers/s2i/java-jni/test/model-template-app/Makefile | 4 ++-- .../wrappers/s2i/java-jni/test/model-template-app/pom.xml | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime index 245acb1367..5478bd9f72 100755 --- a/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime +++ b/incubating/wrappers/s2i/java-jni/s2i/bin/assemble-runtime @@ -8,6 +8,6 @@ # # Move jar binary with inference runtime implementation -mv ./build/target/*.jar ./model.jar +cp ./jboss/target/*.jar ./model.jar diff --git a/incubating/wrappers/s2i/java-jni/s2i/bin/run b/incubating/wrappers/s2i/java-jni/s2i/bin/run index e53e72da25..6db73a755e 100755 --- a/incubating/wrappers/s2i/java-jni/s2i/bin/run +++ b/incubating/wrappers/s2i/java-jni/s2i/bin/run @@ -16,9 +16,7 @@ fi PAYLOAD_PASSTHROUGH=${PAYLOAD_PASSTHROUGH:-true} MODEL_NAME=${MODEL_NAME:-"JavaJNIServer"} -JAVA_JAR_PATH=${JAVA_JAR_PATH:-"/microservice/model.jar"} - -cd /microservice +JAVA_JAR_PATH=${JAVA_JAR_PATH:-"./model.jar"} echo "Starting microservice" exec \ diff --git a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile index 9ee872f832..c11a94607f 100644 --- a/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile +++ b/incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile @@ -1,4 +1,4 @@ -VERSION := 0.1.0 +VERSION := 0.2.0 IMAGE_NAME_BASE=jni-model-template IMAGE=seldonio/${IMAGE_NAME_BASE}:${VERSION} @@ -14,7 +14,7 @@ build: run: docker run \ --rm -it \ - -p 5000:5000 \ + -p 9000:9000 \ ${IMAGE} clean: diff --git a/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml b/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml index 06eec2c950..65e527e860 100644 --- a/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml +++ b/incubating/wrappers/s2i/java-jni/test/model-template-app/pom.xml @@ -30,7 +30,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-compiler-plugin - 3.5.1 + 3.8.1 UTF-8 From be8c8a2188c8ae7fb933800b12ca2fdb51ffddb4 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 23 Feb 2021 15:13:01 +0000 Subject: [PATCH 10/10] Update docs with new version --- doc/source/java-jni/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/java-jni/README.md b/doc/source/java-jni/README.md index be784067f5..09700b2899 100644 --- a/doc/source/java-jni/README.md +++ b/doc/source/java-jni/README.md @@ -25,7 +25,7 @@ s2i](../wrappers/s2i.md) and then follow the steps below. To check everything is working you can run ```bash -s2i usage seldonio/s2i-java-jni-build:0.5.0 +s2i usage seldonio/s2i-java-jni-build:0.5.1 ``` ## Step 2 - Create your source code @@ -153,8 +153,8 @@ The general format is: ```bash s2i build \ \ - seldonio/s2i-java-jni-build:0.5.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ + seldonio/s2i-java-jni-build:0.5.1 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.1 \ ``` @@ -164,8 +164,8 @@ An example invocation using the test template model inside `seldon-core`: s2i build \ https://github.com/seldonio/seldon-core.git \ --context-dir=incubating/wrappers/s2i/java-jni/test/model-template-app \ - seldonio/s2i-java-jni-build:0.5.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ + seldonio/s2i-java-jni-build:0.5.1 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.1 \ jni-model-template:0.1.0 ``` @@ -186,15 +186,15 @@ git clone https://github.com/seldonio/seldon-core.git cd seldon-core s2i build \ incubating/wrappers/s2i/java-jni/test/model-template-app \ - seldonio/s2i-java-jni-build:0.5.0 \ - --runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \ + seldonio/s2i-java-jni-build:0.5.1 \ + --runtime-image seldonio/s2i-java-jni-runtime:0.5.1 \ jni-model-template:0.1.0 ``` For more help see: ```bash -s2i usage seldonio/s2i-java-jni-build:0.5.0 +s2i usage seldonio/s2i-java-jni-build:0.5.1 s2i build --help ```