Skip to content

Commit

Permalink
Fix Docker image building failure on MacOS (ARM architecture) (infini…
Browse files Browse the repository at this point in the history
…flow#1177)

### What problem does this PR solve?

infiniflow#1164 

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
  • Loading branch information
aopstudio authored Jun 17, 2024
1 parent 4482907 commit 636fc00
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ADD ./api ./api
ADD ./conf ./conf
ADD ./deepdoc ./deepdoc
ADD ./rag ./rag
ADD ./graph ./graph

ENV PYTHONPATH=/ragflow/
ENV HF_ENDPOINT=https://hf-mirror.com
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.arm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*

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
RUN cd ./web && npm i --force && npm run build
Expand All @@ -21,6 +21,7 @@ ADD ./api ./api
ADD ./conf ./conf
ADD ./deepdoc ./deepdoc
ADD ./rag ./rag
ADD ./graph ./graph

ENV PYTHONPATH=/ragflow/
ENV HF_ENDPOINT=https://hf-mirror.com
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.scratch
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ADD ./conf ./conf
ADD ./deepdoc ./deepdoc
ADD ./rag ./rag
ADD ./requirements.txt ./requirements.txt
ADD ./graph ./graph

RUN apt install openmpi-bin openmpi-common libopenmpi-dev
ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/openmpi/lib:$LD_LIBRARY_PATH
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.scratch.oc9
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ ADD ./conf ./conf
ADD ./deepdoc ./deepdoc
ADD ./rag ./rag
ADD ./requirements.txt ./requirements.txt
ADD ./graph ./graph

RUN dnf install -y openmpi openmpi-devel python3-openmpi
ENV C_INCLUDE_PATH /usr/include/openmpi-x86_64:$C_INCLUDE_PATH
Expand Down
9 changes: 5 additions & 4 deletions requirements_arm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ pyarrow==15.0.0
pyarrow-hotfix==0.6
pyclipper==1.3.0.post5
pycparser==2.21
pycryptodome==3.20.0
pycryptodome-test-vectors==1.0.14
pycryptodomex==3.20.0
pycryptodome
pycryptodome-test-vectors
pycryptodomex
pydantic==2.6.2
pydantic_core==2.16.3
PyJWT==2.8.0
Expand All @@ -98,7 +98,6 @@ python-dateutil==2.8.2
python-docx==1.1.0
python-dotenv==1.0.1
python-pptx==0.6.23
pytz==2024.1
PyYAML==6.0.1
redis==5.0.3
regex==2023.12.25
Expand Down Expand Up @@ -140,6 +139,8 @@ volcengine==1.0.141
opencv-python-headless==4.9.0.80
readability-lxml==0.8.1
html_text==0.6.2
selenium==4.21.0
webdriver-manager==4.0.1
cn2an==0.5.22
roman-numbers==1.0.2
word2number==1.1

0 comments on commit 636fc00

Please sign in to comment.