[docker] Fixes docker -SNAPSHOT version build issue

deepjavalibrary · Jul 2, 2024 · 310ee7f · 310ee7f
1 parent c9e7222
commit 310ee7f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/docker-nightly-publish.yml b/.github/workflows/docker-nightly-publish.yml
@@ -61,15 +61,15 @@ jobs:
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT ${{ matrix.arch }}
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT ${{ matrix.arch }}
           docker compose push ${{ matrix.arch }}
       - name: Build and push temp image
         if: ${{ github.event.inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT ${{ matrix.arch }}
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT ${{ matrix.arch }}
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:${{ matrix.arch }}-${GITHUB_SHA}"
@@ -160,15 +160,15 @@ jobs:
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT aarch64
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT aarch64
           docker compose push aarch64
       - name: Build and push temp image
         if: ${{ github.event.inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT aarch64
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT aarch64
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:aarch64-${GITHUB_SHA}"
@@ -227,15 +227,15 @@ jobs:
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT lmi
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT lmi
           docker compose push lmi
       - name: Build and push temp image
         if: ${{ github.event.inputs.mode == 'temp' }}
         working-directory: serving/docker
         run: |
           DJL_VERSION=$(awk -F '=' '/djl / {gsub(/ ?"/, "", $2); print $2}' ../../gradle/libs.versions.toml)
           export NIGHTLY="-nightly"
-          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}~SNAPSHOT lmi
+          docker compose build --no-cache --build-arg djl_version=${DJL_VERSION}-SNAPSHOT lmi
           repo="185921645874.dkr.ecr.us-east-1.amazonaws.com/djl-ci-temp"
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin $repo
           tempTag="$repo:lmi-$GITHUB_SHA"

diff --git a/serving/docker/Dockerfile b/serving/docker/Dockerfile
@@ -63,11 +63,10 @@ FROM base AS cpu-full
 ARG torch_version=2.3.1
 
 COPY scripts scripts/
-SHELL ["/bin/bash", "-c"]
 RUN scripts/install_python.sh && \
     scripts/install_djl_serving.sh $djl_version $torch_version && \
     djl-serving -i ai.djl.pytorch:pytorch-native-cpu:$torch_version:linux-x86_64 && \
-    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:${djl_version//[~]/-} && \
+    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:$djl_version && \
     djl-serving -i com.microsoft.onnxruntime:onnxruntime:1.18.0 && \
     scripts/patch_oss_dlc.sh python && \
     echo "${djl_version} cpufull" > /opt/djl/bin/telemetry && \

diff --git a/serving/docker/pytorch-gpu.Dockerfile b/serving/docker/pytorch-gpu.Dockerfile
@@ -52,7 +52,7 @@ SHELL ["/bin/bash", "-c"]
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh && \
     scripts/install_djl_serving.sh $djl_version && \
     scripts/install_djl_serving.sh $djl_version ${torch_version} && \
-    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:${djl_version//[~]/-} && \
+    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:$djl_version && \
     djl-serving -i com.microsoft.onnxruntime:onnxruntime_gpu:$onnx_version && \
     scripts/install_python.sh ${python_version} && \
     scripts/install_s5cmd.sh x64 && \

diff --git a/serving/docker/scripts/install_djl_serving.sh b/serving/docker/scripts/install_djl_serving.sh
@@ -18,22 +18,20 @@ if [ -z "$PYTORCH_JNI" ]; then
     ca-certificates \
     vim
   # add corretto https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/generic-linux-install.html
-  wget -O - https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg && \
-  echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list
-  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends  -y \
-  java-17-amazon-corretto-jdk
+  wget -O - https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg &&
+    echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list
+  apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    java-17-amazon-corretto-jdk
 
   # install DJLServing
   if [ ! -f djl-serving_all.deb ]; then
-    curl https://publish.djl.ai/djl-serving/djl-serving_${DJL_VERSION}-1_all.deb -f -o djl-serving_all.deb
+    curl "https://publish.djl.ai/djl-serving/djl-serving_${DJL_VERSION//-/\~}-1_all.deb" -f -o djl-serving_all.deb
   fi
   dpkg -i djl-serving_all.deb
   rm djl-serving_all.deb
 
   mkdir -p /opt/djl/plugins
 else
-  if [[ ! "$DJL_VERSION" == *SNAPSHOT ]]; then
-    djl-serving -i ai.djl.pytorch:pytorch-jni:${PYTORCH_JNI}-${DJL_VERSION}
-    rm -rf /opt/djl/logs
-  fi
+  djl-serving -i "ai.djl.pytorch:pytorch-jni:${PYTORCH_JNI}-${DJL_VERSION}"
+  rm -rf /opt/djl/logs
 fi