Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change version of JNI build image #2981

Merged
merged 10 commits into from
Feb 23, 2021
Merged

Change version of JNI build image #2981

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
25ff5da
Use new version of the JNI image
Feb 22, 2021
5c6d14c
Change base image of build image
Feb 22, 2021
0264560
Update docs with new version
Feb 22, 2021
1a53245
Move images to ubi8
Feb 23, 2021
8db219f
Update images and tests
Feb 23, 2021
2331031
Set Java version to JDK 1.11 (for compatibility with UBI8 images)
Feb 23, 2021
f201978
Update pom.xml of test
Feb 23, 2021
e0b5962
Update label
Feb 23, 2021
2f3bcac
Upgrade s2i paths after moving to ubi8 images
Feb 23, 2021
be8c8a2
Update docs with new version
Feb 23, 2021
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
16 changes: 8 additions & 8 deletions doc/source/java-jni/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -153,8 +153,8 @@ The general format is:
```bash
s2i build \
<git-repo | src-folder> \
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 \
axsaucedo marked this conversation as resolved.
Show resolved Hide resolved
--runtime-image seldonio/s2i-java-jni-runtime:0.5.0 \
<my-image-name>
```

Expand All @@ -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
```

Expand All @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion incubating/wrappers/s2i/java-jni/Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion incubating/wrappers/s2i/java-jni/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
4 changes: 2 additions & 2 deletions incubating/wrappers/s2i/java-jni/test/model-template-app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions testing/scripts/test_s2i_java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down