Skip to content

Commit 5cd36df

Browse files
authored
update docker use python3.6, test=develop (#133)
Signed-off-by: WangXi <wangxi16@baidu.com>
1 parent 45fd3ca commit 5cd36df

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker pull hub.baidubce.com/paddle-edl/paddle_edl:latest-cuda9.0-cudnn7
2121
nvidia-docker run -name paddle_edl hub.baidubce.com/paddle-edl/paddle_edl:latest-cuda9.0-cudnn7 /bin/bash
2222
```
2323

24-
<h2 align="center">Latest Release(0.3.0)</h2>
24+
<h2 align="center">Latest Release(0.3.1)</h2>
2525

2626
- Support elastic training with inference type services during training, such as knowledge distillation
2727
- Inference type services are automatically registered through service discovery in EDL

docker/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
FROM hub.baidubce.com/paddlepaddle/paddle:<baseimg>
22

3+
# gcc 5
4+
RUN ln -sf /usr/bin/gcc-5 /usr/bin/gcc
5+
# python3 default use python3.6
6+
RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3
7+
38
# Install Go
49
RUN rm -rf /usr/local/go && wget -qO- https://dl.google.com/go/go1.13.10.linux-amd64.tar.gz | \
510
tar -xz -C /usr/local && \
@@ -38,6 +43,7 @@ RUN mkdir -p /tmp/protoc && cd /tmp/protoc && \
3843
wget -q -O protoc-3.11.4-linux-x86_64.zip --no-check-certificate https://paddle-edl.bj.bcebos.com/protoc-3.11.4-linux-x86_64.zip && \
3944
unzip protoc-3.11.4-linux-x86_64.zip && mv bin/protoc /usr/local/bin
4045

46+
RUN echo "export PATH=$PATH:${GOROOT}/bin:${GOPATH}/bin" >> /root/.bashrc
4147
RUN echo "go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.io,direct" >> /root/.bashrc
4248
ENV GO111MODULE=on
4349
ENV GOPROXY=https://goproxy.io,direct

docker/Dockerfile.runtime

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
FROM hub.baidubce.com/paddlepaddle/paddle:<baseimg>
22

3+
# gcc 5
4+
RUN ln -sf /usr/bin/gcc-5 /usr/bin/gcc
5+
# python3 default use python3.6
6+
RUN ln -sf /usr/local/bin/python3.6 /usr/local/bin/python3
7+
38
# Install Go
49
RUN rm -rf /usr/local/go && wget -qO- https://dl.google.com/go/go1.13.10.linux-amd64.tar.gz | \
510
tar -xz -C /usr/local && \
@@ -31,6 +36,11 @@ RUN cd /tmp/ && wget -q https://paddle-edl.bj.bcebos.com/redis-6.0.1.tar.gz &&
3136
mv src/redis-cli /usr/local/bin && \
3237
cd .. && rm -rf redis-6.0.1.tar.gz redis-6.0.1
3338

39+
RUN echo "export PATH=$PATH:${GOROOT}/bin:${GOPATH}/bin" >> /root/.bashrc
40+
RUN echo "go env -w GO111MODULE=on && go env -w GOPROXY=https://goproxy.io,direct" >> /root/.bashrc
41+
ENV GO111MODULE=on
42+
ENV GOPROXY=https://goproxy.io,direct
43+
3444
# install edl
3545
ADD ./build/python/dist/paddle_edl-0.0.0-py2.py3-none-any.whl /tmp/paddle_edl-0.0.0-py2.py3-none-any.whl
3646
RUN python -m pip install /tmp/paddle_edl-0.0.0-py2.py3-none-any.whl

0 commit comments

Comments
 (0)