Skip to content

Commit

Permalink
docker image: update
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelfeil committed Dec 6, 2024
1 parent bc98a9f commit 1b98bf9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions libs/infinity_emb/Dockerfile.amd_auto
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ENV PATH=/app/.venv/bin:$PATH

# Use a multi-stage build -> production version, with download:
# docker buildx build --target=production-with-download --build-arg MODEL_NAME=mixedbread-ai/mxbai-rerank-xsmall-v1 \
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t infinity-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t michaelf34/infinity:0.0.71-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
FROM tested-builder AS production-with-download
# collect model name and engine from build args
ARG MODEL_NAME
Expand All @@ -142,9 +142,9 @@ RUN if [ -z "${ENGINE}" ]; then echo "Error: Build argument ENGINE not set." &&
ENV INFINITY_MODEL_ID=$MODEL_NAME
ENV INFINITY_ENGINE=$ENGINE
# will exit with 3 if model is downloaded # TODO: better exit code
RUN infinity_emb v2 --preload-only || [ $? -eq 3 ]
RUN infinity_emb v2 --preload-only --no-model-warmup || [ $? -eq 3 ]
ENTRYPOINT ["infinity_emb"]

# Use a multi-stage build -> production version
# Use a multiçç-stage build -> production version
FROM tested-builder AS production
ENTRYPOINT ["infinity_emb"]
6 changes: 3 additions & 3 deletions libs/infinity_emb/Dockerfile.cpu_auto
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ENV PATH=/app/.venv/bin:$PATH

# Use a multi-stage build -> production version, with download:
# docker buildx build --target=production-with-download --build-arg MODEL_NAME=mixedbread-ai/mxbai-rerank-xsmall-v1 \
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t infinity-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t michaelf34/infinity:0.0.71-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
FROM tested-builder AS production-with-download
# collect model name and engine from build args
ARG MODEL_NAME
Expand All @@ -110,9 +110,9 @@ RUN if [ -z "${ENGINE}" ]; then echo "Error: Build argument ENGINE not set." &&
ENV INFINITY_MODEL_ID=$MODEL_NAME
ENV INFINITY_ENGINE=$ENGINE
# will exit with 3 if model is downloaded # TODO: better exit code
RUN infinity_emb v2 --preload-only || [ $? -eq 3 ]
RUN infinity_emb v2 --preload-only --no-model-warmup || [ $? -eq 3 ]
ENTRYPOINT ["infinity_emb"]

# Use a multi-stage build -> production version
# Use a multiçç-stage build -> production version
FROM tested-builder AS production
ENTRYPOINT ["infinity_emb"]
6 changes: 3 additions & 3 deletions libs/infinity_emb/Dockerfile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ENV PATH=/app/.venv/bin:$PATH

# Use a multi-stage build -> production version, with download:
# docker buildx build --target=production-with-download --build-arg MODEL_NAME=mixedbread-ai/mxbai-rerank-xsmall-v1 \
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t infinity-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t michaelf34/infinity:0.0.71-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
FROM tested-builder AS production-with-download
# collect model name and engine from build args
ARG MODEL_NAME
Expand All @@ -96,9 +96,9 @@ RUN if [ -z "${ENGINE}" ]; then echo "Error: Build argument ENGINE not set." &&
ENV INFINITY_MODEL_ID=$MODEL_NAME
ENV INFINITY_ENGINE=$ENGINE
# will exit with 3 if model is downloaded # TODO: better exit code
RUN infinity_emb v2 --preload-only || [ $? -eq 3 ]
RUN infinity_emb v2 --preload-only --no-model-warmup || [ $? -eq 3 ]
ENTRYPOINT ["infinity_emb"]

# Use a multi-stage build -> production version
# Use a multiçç-stage build -> production version
FROM tested-builder AS production
ENTRYPOINT ["infinity_emb"]
6 changes: 3 additions & 3 deletions libs/infinity_emb/Dockerfile.nvidia_auto
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ENV PATH=/app/.venv/bin:$PATH

# Use a multi-stage build -> production version, with download:
# docker buildx build --target=production-with-download --build-arg MODEL_NAME=mixedbread-ai/mxbai-rerank-xsmall-v1 \
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t infinity-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t michaelf34/infinity:0.0.71-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
FROM tested-builder AS production-with-download
# collect model name and engine from build args
ARG MODEL_NAME
Expand All @@ -96,9 +96,9 @@ RUN if [ -z "${ENGINE}" ]; then echo "Error: Build argument ENGINE not set." &&
ENV INFINITY_MODEL_ID=$MODEL_NAME
ENV INFINITY_ENGINE=$ENGINE
# will exit with 3 if model is downloaded # TODO: better exit code
RUN infinity_emb v2 --preload-only || [ $? -eq 3 ]
RUN infinity_emb v2 --preload-only --no-model-warmup || [ $? -eq 3 ]
ENTRYPOINT ["infinity_emb"]

# Use a multi-stage build -> production version
# Use a multiçç-stage build -> production version
FROM tested-builder AS production
ENTRYPOINT ["infinity_emb"]
6 changes: 3 additions & 3 deletions libs/infinity_emb/Dockerfile.trt_onnx_auto
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ENV PATH=/app/.venv/bin:$PATH

# Use a multi-stage build -> production version, with download:
# docker buildx build --target=production-with-download --build-arg MODEL_NAME=mixedbread-ai/mxbai-rerank-xsmall-v1 \
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t infinity-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
# --build-arg ENGINE=torch -f Dockerfile.nvidia_auto -t michaelf34/infinity:0.0.71-with-mixedbread-ai-mxbai-rerank-xsmall-v1 .
FROM tested-builder AS production-with-download
# collect model name and engine from build args
ARG MODEL_NAME
Expand All @@ -103,9 +103,9 @@ RUN if [ -z "${ENGINE}" ]; then echo "Error: Build argument ENGINE not set." &&
ENV INFINITY_MODEL_ID=$MODEL_NAME
ENV INFINITY_ENGINE=$ENGINE
# will exit with 3 if model is downloaded # TODO: better exit code
RUN infinity_emb v2 --preload-only || [ $? -eq 3 ]
RUN infinity_emb v2 --preload-only --no-model-warmup || [ $? -eq 3 ]
ENTRYPOINT ["infinity_emb"]

# Use a multi-stage build -> production version
# Use a multiçç-stage build -> production version
FROM tested-builder AS production
ENTRYPOINT ["infinity_emb"]

0 comments on commit 1b98bf9

Please sign in to comment.