From 37fe056ccd26c67dd4056d328522c52d4f5b3784 Mon Sep 17 00:00:00 2001 From: Joseph Cheung Date: Tue, 28 Feb 2023 21:54:17 +0800 Subject: [PATCH] o --- Dockerfile | 13 ++++++++++++- requirements-dev.txt | 2 +- requirements.txt | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 565577ec3..9c96b46c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,12 @@ -FROM python:3.10-alpine +FROM python:3.11-slim-bullseye as builder + +# Tiktoken requires Rust toolchain, so build it in a separate stage +RUN apt-get update && apt-get install -y gcc curl +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && apt-get install --reinstall libc6-dev -y +ENV PATH="/root/.cargo/bin:${PATH}" +RUN pip install --upgrade pip && pip install tiktoken + +FROM python:3.11-alpine ENTRYPOINT ["/sbin/tini","--","/usr/local/searxng/dockerfiles/docker-entrypoint.sh"] EXPOSE 8080 VOLUME /etc/searxng @@ -6,6 +14,7 @@ VOLUME /etc/searxng ARG SEARXNG_GID=977 ARG SEARXNG_UID=977 + RUN addgroup -g ${SEARXNG_GID} searxng && \ adduser -u ${SEARXNG_UID} -D -h /usr/local/searxng -s /bin/sh -G searxng searxng @@ -23,6 +32,8 @@ WORKDIR /usr/local/searxng COPY requirements.txt ./requirements.txt +COPY --from=builder /usr/local/lib/python3.11/site-packages/ /usr/local/lib/python3.11/site-packages/ + RUN apk add --no-cache -t build-dependencies \ build-base \ py3-setuptools \ diff --git a/requirements-dev.txt b/requirements-dev.txt index 7c35fb5c8..60fc20ac1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -22,5 +22,5 @@ wlc==1.13 coloredlogs==15.0.1 requests markdown -tiktoken +scipy git+https://github.com/luxtiasco/TextRank4ZH.git \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1ec4823a3..0aafdaa75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,5 +18,5 @@ typing_extensions==4.5.0 fasttext-predict==0.9.2.1 requests markdown -tiktoken +scipy git+https://github.com/luxtiasco/TextRank4ZH.git \ No newline at end of file