From ea4577adb78ee5b245916e4f1c6b46fbd4a5ff57 Mon Sep 17 00:00:00 2001 From: WenmuZhou Date: Fri, 29 Jan 2021 10:11:23 +0800 Subject: [PATCH 1/3] update docker --- deploy/docker/hubserving/gpu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/hubserving/gpu/Dockerfile b/deploy/docker/hubserving/gpu/Dockerfile index b7fa6f4ca..144e1b35a 100644 --- a/deploy/docker/hubserving/gpu/Dockerfile +++ b/deploy/docker/hubserving/gpu/Dockerfile @@ -1,5 +1,5 @@ # Version: 2.0.0 -FROM egistry.baidubce.com/paddlepaddle/paddle:2.0.0rc1-gpu-cuda10.0-cudnn7 +FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0rc1-gpu-cuda10.0-cudnn7 # PaddleOCR base on Python3.7 RUN pip3.7 install --upgrade pip -i https://mirror.baidu.com/pypi/simple From 8fb01540e7dd55b37456552b4971be82f4612bd5 Mon Sep 17 00:00:00 2001 From: WenmuZhou Date: Fri, 29 Jan 2021 10:24:51 +0800 Subject: [PATCH 2/3] add paddle install --- deploy/docker/hubserving/cpu/Dockerfile | 2 ++ deploy/docker/hubserving/gpu/Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deploy/docker/hubserving/cpu/Dockerfile b/deploy/docker/hubserving/cpu/Dockerfile index e46ca73be..62a01bee8 100644 --- a/deploy/docker/hubserving/cpu/Dockerfile +++ b/deploy/docker/hubserving/cpu/Dockerfile @@ -4,6 +4,8 @@ FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0rc1 # PaddleOCR base on Python3.7 RUN pip3.7 install --upgrade pip -i https://mirror.baidu.com/pypi/simple +RUN python3.7 -m pip install paddlepaddle==2.0.0 -i https://mirror.baidu.com/pypi/simple + RUN pip3.7 install paddlehub --upgrade -i https://mirror.baidu.com/pypi/simple RUN git clone https://github.com/PaddlePaddle/PaddleOCR.git /PaddleOCR diff --git a/deploy/docker/hubserving/gpu/Dockerfile b/deploy/docker/hubserving/gpu/Dockerfile index 144e1b35a..7a80bc564 100644 --- a/deploy/docker/hubserving/gpu/Dockerfile +++ b/deploy/docker/hubserving/gpu/Dockerfile @@ -4,6 +4,8 @@ FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0rc1-gpu-cuda10.0-cudnn7 # PaddleOCR base on Python3.7 RUN pip3.7 install --upgrade pip -i https://mirror.baidu.com/pypi/simple +RUN python3.7 -m pip install paddlepaddle-gpu==2.0.0 -i https://mirror.baidu.com/pypi/simple + RUN pip3.7 install paddlehub --upgrade -i https://mirror.baidu.com/pypi/simple RUN git clone https://github.com/PaddlePaddle/PaddleOCR.git /PaddleOCR From 23df5bcf1251a9f530acc7a7b96ef619b831df99 Mon Sep 17 00:00:00 2001 From: WenmuZhou Date: Mon, 1 Feb 2021 15:38:31 +0800 Subject: [PATCH 3/3] update dockerfile --- deploy/docker/hubserving/cpu/Dockerfile | 4 +--- deploy/docker/hubserving/gpu/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/deploy/docker/hubserving/cpu/Dockerfile b/deploy/docker/hubserving/cpu/Dockerfile index 62a01bee8..ef1a7b7b1 100644 --- a/deploy/docker/hubserving/cpu/Dockerfile +++ b/deploy/docker/hubserving/cpu/Dockerfile @@ -1,11 +1,9 @@ # Version: 2.0.0 -FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0rc1 +FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0 # PaddleOCR base on Python3.7 RUN pip3.7 install --upgrade pip -i https://mirror.baidu.com/pypi/simple -RUN python3.7 -m pip install paddlepaddle==2.0.0 -i https://mirror.baidu.com/pypi/simple - RUN pip3.7 install paddlehub --upgrade -i https://mirror.baidu.com/pypi/simple RUN git clone https://github.com/PaddlePaddle/PaddleOCR.git /PaddleOCR diff --git a/deploy/docker/hubserving/gpu/Dockerfile b/deploy/docker/hubserving/gpu/Dockerfile index 7a80bc564..b3f2d21ff 100644 --- a/deploy/docker/hubserving/gpu/Dockerfile +++ b/deploy/docker/hubserving/gpu/Dockerfile @@ -1,11 +1,9 @@ # Version: 2.0.0 -FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0rc1-gpu-cuda10.0-cudnn7 +FROM registry.baidubce.com/paddlepaddle/paddle:2.0.0-gpu-cuda10.1-cudnn7 # PaddleOCR base on Python3.7 RUN pip3.7 install --upgrade pip -i https://mirror.baidu.com/pypi/simple -RUN python3.7 -m pip install paddlepaddle-gpu==2.0.0 -i https://mirror.baidu.com/pypi/simple - RUN pip3.7 install paddlehub --upgrade -i https://mirror.baidu.com/pypi/simple RUN git clone https://github.com/PaddlePaddle/PaddleOCR.git /PaddleOCR