diff --git a/serving/serving/docker/.gitignore b/serving/serving/docker/.gitignore deleted file mode 100644 index 2fd4c3b3501..00000000000 --- a/serving/serving/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libs/ diff --git a/serving/serving/docker/Dockerfile b/serving/serving/docker/Dockerfile index 01db73cd860..d9a5322f25a 100644 --- a/serving/serving/docker/Dockerfile +++ b/serving/serving/docker/Dockerfile @@ -1,22 +1,20 @@ FROM ubuntu:18.04 +ARG djl_version=0.12.0 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ fakeroot \ - openjdk-8-jdk-headless + openjdk-8-jdk-headless \ + curl + +RUN curl -O https://publish.djl.ai/djl-serving/djl-serving_${djl_version}-1_all.deb && \ + dpkg -i djl-serving_${djl_version}-1_all.deb && \ + rm djl-serving_${djl_version}-1_all.deb RUN mkdir -p /opt/djl +COPY config.properties /opt/djl/conf/ COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh -COPY config.properties /opt/djl/ -COPY serving /opt/djl/tmp - -RUN cd /opt/djl/tmp \ - && ./gradlew copyLibs \ - && cd .. \ - && rm -rf tmp \ - && rm -rf ~/.gradle - RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh EXPOSE 8080 @@ -29,6 +27,7 @@ ENV TF_NUM_INTRAOP_THREADS=1 ENV TF_CPP_MIN_LOG_LEVEL=1 ENV MXNET_ENGINE_TYPE=NaiveEngine ENV JAVA_OPTS="-Dai.djl.pytorch.num_interop_threads=1" +ENV MODEL_SERVER_HOME=/opt/djl ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"] CMD ["serve"] diff --git a/serving/serving/docker/dockerd-entrypoint.sh b/serving/serving/docker/dockerd-entrypoint.sh index 4c2b8c2058b..d6c4b0d8d6d 100644 --- a/serving/serving/docker/dockerd-entrypoint.sh +++ b/serving/serving/docker/dockerd-entrypoint.sh @@ -3,10 +3,7 @@ set -e if [[ "$1" = "serve" ]]; then shift 1 - java $JAVA_OPTS -cp "libs/*" ai.djl.serving.ModelServer "$APP_ARGS" + /usr/bin/djl-serving "$@" else eval "$@" fi - -# prevent docker exit -tail -f /dev/null diff --git a/serving/serving/docker/serving/build.gradle b/serving/serving/docker/serving/build.gradle deleted file mode 100644 index 7651b9b4707..00000000000 --- a/serving/serving/docker/serving/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -plugins { - id "java" -} - -repositories { - mavenCentral() -} - -dependencies { - implementation platform("ai.djl:bom:0.11.0") - runtimeOnly "ai.djl:serving" -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -task copyLibs(type: Copy) { - into "../libs" - from configurations.runtimeClasspath -} diff --git a/serving/serving/docker/serving/gradle/wrapper/.gitignore b/serving/serving/docker/serving/gradle/wrapper/.gitignore deleted file mode 100644 index 24daf48f106..00000000000 --- a/serving/serving/docker/serving/gradle/wrapper/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gradle-wrapper.jar diff --git a/serving/serving/docker/serving/gradle/wrapper/GradleWrapperDownloader.java b/serving/serving/docker/serving/gradle/wrapper/GradleWrapperDownloader.java deleted file mode 100644 index 8a1a34a8df1..00000000000 --- a/serving/serving/docker/serving/gradle/wrapper/GradleWrapperDownloader.java +++ /dev/null @@ -1,75 +0,0 @@ -/* -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, 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 java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class GradleWrapperDownloader { - - /** - * URL to download the gradle-wrapper.jar from. - */ - private static final String DEFAULT_DOWNLOAD_URL = - "https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar"; - - /** - * Path where the gradle-wrapper.jar will be saved to. - */ - private static final String GRADLE_WRAPPER_JAR_PATH = - "gradle/wrapper/gradle-wrapper.jar"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - String url = DEFAULT_DOWNLOAD_URL; - System.out.println("- Downloading from: : " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), GRADLE_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } -} diff --git a/serving/serving/docker/serving/gradle/wrapper/gradle-wrapper.properties b/serving/serving/docker/serving/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index ffa5369c955..00000000000 --- a/serving/serving/docker/serving/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Wed Jan 16 22:46:13 PST 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/serving/serving/docker/serving/gradlew b/serving/serving/docker/serving/gradlew deleted file mode 100755 index b70597b6863..00000000000 --- a/serving/serving/docker/serving/gradlew +++ /dev/null @@ -1,201 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -########################################################################################## -# Extension to allow automatically downloading the gradle-wrapper.jar -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -WRAPPER_JAR_PATH="$APP_HOME/gradle/wrapper/gradle-wrapper.jar" -if [ ! -r "${WRAPPER_JAR_PATH}" ]; then - jarUrl="https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar" - if command -v wget > /dev/null; then - wget -q "${jarUrl}" -O "${WRAPPER_JAR_PATH}" - elif command -v curl > /dev/null; then - curl -s -o "${WRAPPER_JAR_PATH}" "$jarUrl" - else - javaClass="$APP_HOME/gradle/wrapper/GradleWrapperDownloader.java" - if [ -e "$javaClass" ]; then - if [ ! -e "$APP_HOME/gradle/wrapper/GradleWrapperDownloader.class" ]; then - # Compiling the Java class - ("${JAVACMD}c" "$javaClass") - fi - if [ -e "$APP_HOME/gradle/wrapper/GradleWrapperDownloader.class" ]; then - ("$JAVACMD" -cp gradle/wrapper GradleWrapperDownloader "$APP_HOME") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/serving/serving/docker/serving/settings.gradle b/serving/serving/docker/serving/settings.gradle deleted file mode 100644 index e69de29bb2d..00000000000