KMS/ragflow
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Docker image building failure on MacOS (ARM architecture) (#1177)

Browse Source 
### What problem does this PR solve?

#1164 

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Zhedong Cen 2024-06-17 10:46:21 +08:00 committed by GitHub
parent c68767acdd
commit 747e69ef68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -10,6 +10,7 @@ ADD ./api ./api
ADD ./conf ./conf ADD ./conf ./conf
ADD ./deepdoc ./deepdoc ADD ./deepdoc ./deepdoc
ADD ./rag ./rag ADD ./rag ./rag
ADD ./graph ./graph
ENV PYTHONPATH=/ragflow/ ENV PYTHONPATH=/ragflow/
ENV HF_ENDPOINT=https://hf-mirror.com ENV HF_ENDPOINT=https://hf-mirror.com

3
Dockerfile.arm
View File

@ -12,7 +12,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs nginx ffmpeg libsm6 libxext6 libgl1 apt-get install -y --fix-missing nodejs nginx ffmpeg libsm6 libxext6 libgl1
ADD ./web ./web ADD ./web ./web
RUN cd ./web && npm i --force && npm run build RUN cd ./web && npm i --force && npm run build
@ -21,6 +21,7 @@ ADD ./api ./api
ADD ./conf ./conf ADD ./conf ./conf
ADD ./deepdoc ./deepdoc ADD ./deepdoc ./deepdoc
ADD ./rag ./rag ADD ./rag ./rag
ADD ./graph ./graph
ENV PYTHONPATH=/ragflow/ ENV PYTHONPATH=/ragflow/
ENV HF_ENDPOINT=https://hf-mirror.com ENV HF_ENDPOINT=https://hf-mirror.com

1
Dockerfile.scratch
View File

@ -30,6 +30,7 @@ ADD ./conf ./conf
ADD ./deepdoc ./deepdoc ADD ./deepdoc ./deepdoc
ADD ./rag ./rag ADD ./rag ./rag
ADD ./requirements.txt ./requirements.txt ADD ./requirements.txt ./requirements.txt
ADD ./graph ./graph
RUN apt install openmpi-bin openmpi-common libopenmpi-dev RUN apt install openmpi-bin openmpi-common libopenmpi-dev
ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/openmpi/lib:$LD_LIBRARY_PATH ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/openmpi/lib:$LD_LIBRARY_PATH

1
Dockerfile.scratch.oc9
View File

@ -30,6 +30,7 @@ ADD ./conf ./conf
ADD ./deepdoc ./deepdoc ADD ./deepdoc ./deepdoc
ADD ./rag ./rag ADD ./rag ./rag
ADD ./requirements.txt ./requirements.txt ADD ./requirements.txt ./requirements.txt
ADD ./graph ./graph
RUN dnf install -y openmpi openmpi-devel python3-openmpi RUN dnf install -y openmpi openmpi-devel python3-openmpi
ENV C_INCLUDE_PATH /usr/include/openmpi-x86_64:$C_INCLUDE_PATH ENV C_INCLUDE_PATH /usr/include/openmpi-x86_64:$C_INCLUDE_PATH

9
requirements_arm.txt
View File

@ -85,9 +85,9 @@ pyarrow==15.0.0
pyarrow-hotfix==0.6 pyarrow-hotfix==0.6
pyclipper==1.3.0.post5 pyclipper==1.3.0.post5
pycparser==2.21 pycparser==2.21
pycryptodome==3.20.0 pycryptodome
pycryptodome-test-vectors==1.0.14 pycryptodome-test-vectors
pycryptodomex==3.20.0 pycryptodomex
pydantic==2.6.2 pydantic==2.6.2
pydantic_core==2.16.3 pydantic_core==2.16.3
PyJWT==2.8.0 PyJWT==2.8.0
@ -98,7 +98,6 @@ python-dateutil==2.8.2
python-docx==1.1.0 python-docx==1.1.0
python-dotenv==1.0.1 python-dotenv==1.0.1
python-pptx==0.6.23 python-pptx==0.6.23
pytz==2024.1
PyYAML==6.0.1 PyYAML==6.0.1
redis==5.0.3 redis==5.0.3
regex==2023.12.25 regex==2023.12.25
@ -140,6 +139,8 @@ volcengine==1.0.141
opencv-python-headless==4.9.0.80 opencv-python-headless==4.9.0.80
readability-lxml==0.8.1 readability-lxml==0.8.1
html_text==0.6.2 html_text==0.6.2
selenium==4.21.0
webdriver-manager==4.0.1
cn2an==0.5.22 cn2an==0.5.22
roman-numbers==1.0.2 roman-numbers==1.0.2
word2number==1.1 word2number==1.1