Fix Docker image building failure on MacOS (ARM architecture) (#1177)
Browse files### What problem does this PR solve?
#1164
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- Dockerfile +1 -0
- Dockerfile.arm +2 -1
- Dockerfile.scratch +1 -0
- Dockerfile.scratch.oc9 +1 -0
- requirements_arm.txt +5 -4
Dockerfile
CHANGED
|
@@ -10,6 +10,7 @@ ADD ./api ./api
|
|
| 10 |
ADD ./conf ./conf
|
| 11 |
ADD ./deepdoc ./deepdoc
|
| 12 |
ADD ./rag ./rag
|
|
|
|
| 13 |
|
| 14 |
ENV PYTHONPATH=/ragflow/
|
| 15 |
ENV HF_ENDPOINT=https://hf-mirror.com
|
|
|
|
| 10 |
ADD ./conf ./conf
|
| 11 |
ADD ./deepdoc ./deepdoc
|
| 12 |
ADD ./rag ./rag
|
| 13 |
+
ADD ./graph ./graph
|
| 14 |
|
| 15 |
ENV PYTHONPATH=/ragflow/
|
| 16 |
ENV HF_ENDPOINT=https://hf-mirror.com
|
Dockerfile.arm
CHANGED
|
@@ -12,7 +12,7 @@ RUN apt-get update && \
|
|
| 12 |
rm -rf /var/lib/apt/lists/*
|
| 13 |
|
| 14 |
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
|
| 15 |
-
apt-get install -y nodejs nginx ffmpeg libsm6 libxext6 libgl1
|
| 16 |
|
| 17 |
ADD ./web ./web
|
| 18 |
RUN cd ./web && npm i --force && npm run build
|
|
@@ -21,6 +21,7 @@ ADD ./api ./api
|
|
| 21 |
ADD ./conf ./conf
|
| 22 |
ADD ./deepdoc ./deepdoc
|
| 23 |
ADD ./rag ./rag
|
|
|
|
| 24 |
|
| 25 |
ENV PYTHONPATH=/ragflow/
|
| 26 |
ENV HF_ENDPOINT=https://hf-mirror.com
|
|
|
|
| 12 |
rm -rf /var/lib/apt/lists/*
|
| 13 |
|
| 14 |
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
|
| 15 |
+
apt-get install -y --fix-missing nodejs nginx ffmpeg libsm6 libxext6 libgl1
|
| 16 |
|
| 17 |
ADD ./web ./web
|
| 18 |
RUN cd ./web && npm i --force && npm run build
|
|
|
|
| 21 |
ADD ./conf ./conf
|
| 22 |
ADD ./deepdoc ./deepdoc
|
| 23 |
ADD ./rag ./rag
|
| 24 |
+
ADD ./graph ./graph
|
| 25 |
|
| 26 |
ENV PYTHONPATH=/ragflow/
|
| 27 |
ENV HF_ENDPOINT=https://hf-mirror.com
|
Dockerfile.scratch
CHANGED
|
@@ -30,6 +30,7 @@ ADD ./conf ./conf
|
|
| 30 |
ADD ./deepdoc ./deepdoc
|
| 31 |
ADD ./rag ./rag
|
| 32 |
ADD ./requirements.txt ./requirements.txt
|
|
|
|
| 33 |
|
| 34 |
RUN apt install openmpi-bin openmpi-common libopenmpi-dev
|
| 35 |
ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/openmpi/lib:$LD_LIBRARY_PATH
|
|
|
|
| 30 |
ADD ./deepdoc ./deepdoc
|
| 31 |
ADD ./rag ./rag
|
| 32 |
ADD ./requirements.txt ./requirements.txt
|
| 33 |
+
ADD ./graph ./graph
|
| 34 |
|
| 35 |
RUN apt install openmpi-bin openmpi-common libopenmpi-dev
|
| 36 |
ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/openmpi/lib:$LD_LIBRARY_PATH
|
Dockerfile.scratch.oc9
CHANGED
|
@@ -30,6 +30,7 @@ ADD ./conf ./conf
|
|
| 30 |
ADD ./deepdoc ./deepdoc
|
| 31 |
ADD ./rag ./rag
|
| 32 |
ADD ./requirements.txt ./requirements.txt
|
|
|
|
| 33 |
|
| 34 |
RUN dnf install -y openmpi openmpi-devel python3-openmpi
|
| 35 |
ENV C_INCLUDE_PATH /usr/include/openmpi-x86_64:$C_INCLUDE_PATH
|
|
|
|
| 30 |
ADD ./deepdoc ./deepdoc
|
| 31 |
ADD ./rag ./rag
|
| 32 |
ADD ./requirements.txt ./requirements.txt
|
| 33 |
+
ADD ./graph ./graph
|
| 34 |
|
| 35 |
RUN dnf install -y openmpi openmpi-devel python3-openmpi
|
| 36 |
ENV C_INCLUDE_PATH /usr/include/openmpi-x86_64:$C_INCLUDE_PATH
|
requirements_arm.txt
CHANGED
|
@@ -85,9 +85,9 @@ pyarrow==15.0.0
|
|
| 85 |
pyarrow-hotfix==0.6
|
| 86 |
pyclipper==1.3.0.post5
|
| 87 |
pycparser==2.21
|
| 88 |
-
pycryptodome
|
| 89 |
-
pycryptodome-test-vectors
|
| 90 |
-
pycryptodomex
|
| 91 |
pydantic==2.6.2
|
| 92 |
pydantic_core==2.16.3
|
| 93 |
PyJWT==2.8.0
|
|
@@ -98,7 +98,6 @@ python-dateutil==2.8.2
|
|
| 98 |
python-docx==1.1.0
|
| 99 |
python-dotenv==1.0.1
|
| 100 |
python-pptx==0.6.23
|
| 101 |
-
pytz==2024.1
|
| 102 |
PyYAML==6.0.1
|
| 103 |
redis==5.0.3
|
| 104 |
regex==2023.12.25
|
|
@@ -140,6 +139,8 @@ volcengine==1.0.141
|
|
| 140 |
opencv-python-headless==4.9.0.80
|
| 141 |
readability-lxml==0.8.1
|
| 142 |
html_text==0.6.2
|
|
|
|
|
|
|
| 143 |
cn2an==0.5.22
|
| 144 |
roman-numbers==1.0.2
|
| 145 |
word2number==1.1
|
|
|
|
| 85 |
pyarrow-hotfix==0.6
|
| 86 |
pyclipper==1.3.0.post5
|
| 87 |
pycparser==2.21
|
| 88 |
+
pycryptodome
|
| 89 |
+
pycryptodome-test-vectors
|
| 90 |
+
pycryptodomex
|
| 91 |
pydantic==2.6.2
|
| 92 |
pydantic_core==2.16.3
|
| 93 |
PyJWT==2.8.0
|
|
|
|
| 98 |
python-docx==1.1.0
|
| 99 |
python-dotenv==1.0.1
|
| 100 |
python-pptx==0.6.23
|
|
|
|
| 101 |
PyYAML==6.0.1
|
| 102 |
redis==5.0.3
|
| 103 |
regex==2023.12.25
|
|
|
|
| 139 |
opencv-python-headless==4.9.0.80
|
| 140 |
readability-lxml==0.8.1
|
| 141 |
html_text==0.6.2
|
| 142 |
+
selenium==4.21.0
|
| 143 |
+
webdriver-manager==4.0.1
|
| 144 |
cn2an==0.5.22
|
| 145 |
roman-numbers==1.0.2
|
| 146 |
word2number==1.1
|