fix: gpu tag

jina-ai · Jun 14, 2022 · b7e7a62 · b7e7a62
1 parent 9250122
commit b7e7a62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/force-hub-push.yml b/.github/workflows/force-hub-push.yml
@@ -110,13 +110,11 @@ jobs:
           " > server/manifest.yml
           
           python scripts/get-requirements.py "" server/requirements.txt
-                    
-          cp Dockerfiles/base.Dockerfile server/Dockerfile
-          cp Dockerfiles/cuda.Dockerfile server/Dockerfile.gpu
           
           exec_name=`yq -r .name server/manifest.yml`
           echo executor name is $exec_name
-
+                    
+          cp Dockerfiles/base.Dockerfile server/Dockerfile
           JINA_AUTH_TOKEN=${{secrets.JINAHUB_TOKEN}} jina hub push --force $exec_name --secret ${{secrets.TORCH_EXEC_SECRET}} server ${{env.TAG_ALIAS}}
           
           cp Dockerfiles/cuda.Dockerfile server/Dockerfile

diff --git a/Dockerfiles/cuda.Dockerfile b/Dockerfiles/cuda.Dockerfile
@@ -28,7 +28,7 @@ metas:\n\
     - clip_server/executors/clip_$BACKEND_TAG.py\n\
 " > /tmp/config.yml
 
-RUN cd /clip-as-service && \
+RUN cd /clip_server && \
     if [ "${BACKEND_TAG}" != "torch" ]; then python3 -m pip install --no-cache-dir "./[${BACKEND_TAG}]" ; fi && \
     python3 -m pip install --no-cache-dir .
 

diff --git a/Dockerfiles/tensorrt.Dockerfile b/Dockerfiles/tensorrt.Dockerfile
@@ -10,19 +10,17 @@ ARG BACKEND_TAG=tensorrt
 RUN pip3 install --default-timeout=1000 --no-cache-dir torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu113
 RUN pip3 -m pip install --default-timeout=1000 --no-cache-dir "jina[standard]==${JINA_VERSION}"
 
-
 # copy will almost always invalid the cache
 COPY . /clip_server/
 
-RUN pip3 install --no-cache-dir "server/[$BACKEND_TAG]"
-
 RUN echo '\
 jtype: CLIPEncoder\n\
 metas:\n\
   py_modules:\n\
     - clip_server/executors/clip_$BACKEND_TAG.py\n\
 ' > /tmp/config.yml
 
+RUN cd /clip_server/ && python3 -m pip install --no-cache-dir "./[$BACKEND_TAG]"
 
 WORKDIR /clip_server