Skip to content

Commit e347f63

Browse files
llhellhe
committed
Fix docker build
1 parent b1aa90e commit e347f63

File tree

3 files changed

+36
-79
lines changed

3 files changed

+36
-79
lines changed

‎docker/mace-dev-lite/Dockerfile

+21-23
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ RUN curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/py
5050
ENV PATH /root/.pyenv/bin:/root/.pyenv/shims/:${PATH}
5151
RUN eval "$(pyenv init -)"
5252
RUN eval "$(pyenv virtualenv-init -)"
53-
RUN pyenv install 2.7.14 && pyenv install 3.6.3
54-
RUN pyenv global 2.7.14
53+
RUN pyenv install 3.6.3
54+
RUN pyenv global 3.6.3
5555

5656
# Setup vim
5757
RUN apt-get install -y --no-install-recommends \
@@ -98,46 +98,44 @@ RUN mkdir -p /opt/sdk && \
9898
yes | android update sdk --no-ui -a --filter tools,platform-tools,${ANDROID_API_LEVELS},build-tools-${ANDROID_BUILD_TOOLS_VERSION}
9999
RUN ${ANDROID_HOME}/tools/bin/sdkmanager "cmake;3.6.4111459"
100100

101-
# Download NDK
101+
# Download NDK 19c
102102
RUN cd /opt/ && \
103-
wget -q https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip && \
104-
unzip -q android-ndk-r15c-linux-x86_64.zip && \
105-
rm -f android-ndk-r15c-linux-x86_64.zip
103+
wget -q https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && \
104+
unzip -q android-ndk-r19c-linux-x86_64.zip && \
105+
rm -f android-ndk-r19c-linux-x86_64.zip
106106

107107
ENV ANDROID_NDK_VERSION r19c
108108
ENV ANDROID_NDK_HOME /opt/android-ndk-${ANDROID_NDK_VERSION}
109109

110-
# add to PATH
111-
ENV PATH ${PATH}:${ANDROID_NDK_HOME}
112-
113110
# Install tools
114111
RUN apt-get install -y --no-install-recommends \
115112
android-tools-adb
113+
# fix docker in docker error: `error while loading shared libraries: libltdl.so.7`
114+
# refer to: https://github.com/jenkinsci/docker/issues/506
115+
RUN apt-get install -y libltdl7
116+
116117
RUN pip install --upgrade pip
117118
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com setuptools
118119
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
119-
numpy>=1.14.0 \
120-
scipy \
121-
jinja2 \
122-
pyyaml \
120+
numpy==1.15.4 \
121+
scipy==1.2.0 \
122+
Jinja2==2.10 \
123+
PyYAML==3.13 \
123124
sh==1.12.14 \
124125
pycodestyle==2.4.0 \
125-
filelock \
126-
PTable
126+
filelock==3.0.10 \
127+
PTable==0.9.2
127128

128-
# Install Tensorflow
129129
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
130130
tensorflow==1.8.0
131131

132132
# Install pytorch (refer to: https://pytorch.org/get-started/locally/)
133-
RUN pip install future==0.17.1 torchvision_nightly
134-
RUN pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
133+
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
134+
future==0.17.1 \
135+
Pillow==5.4.1 \
136+
torch==1.1.0 \
137+
torchvision==0.2.2.post3
135138

136-
# Install ONNX
137139
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
138140
onnx==1.3.0 \
139141
onnx-tf==1.2.0
140-
141-
# fix docker in docker error: `error while loading shared libraries: libltdl.so.7`
142-
# refer to: https://github.com/jenkinsci/docker/issues/506
143-
RUN apt-get install -y libltdl7

‎docker/mace-dev/Dockerfile

+9-50
Original file line numberDiff line numberDiff line change
@@ -9,66 +9,25 @@ RUN apt-get install -y --no-install-recommends \
99
screen \
1010
htop
1111

12-
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
13-
sphinx \
14-
sphinx-autobuild \
15-
sphinx_rtd_theme \
16-
recommonmark
17-
18-
# ============ Install same deps for python3 ============
1912
RUN pyenv global 3.6.3
2013

21-
# Install tools
22-
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com setuptools
23-
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
24-
"numpy>=1.14.0" \
25-
scipy \
26-
jinja2 \
27-
pyyaml \
28-
sh==1.12.14 \
29-
pycodestyle==2.4.0 \
30-
filelock \
31-
PTable
32-
33-
# Install Tensorflow
34-
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
35-
tensorflow==1.8.0
36-
37-
# Install pytorch (refer to: https://pytorch.org/get-started/locally/)
38-
RUN pip install future==0.17.1 torchvision_nightly
39-
RUN pip install torch_nightly -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
40-
41-
# Install ONNX
42-
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
43-
onnx==1.3.0 \
44-
onnx-tf==1.2.0
45-
4614
RUN pip install -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com \
4715
sphinx \
4816
sphinx-autobuild \
4917
sphinx_rtd_theme \
5018
recommonmark
5119

52-
RUN pyenv global 2.7.14
53-
# ============ End installing same deps for python3 ============
54-
55-
5620
# Customize vim
57-
RUN mkdir -p ~/.vim/autoload ~/.vim/bundle && \
58-
curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
59-
RUN mkdir -p ~/.vim/bundle
60-
RUN cd ~/.vim/bundle && \
61-
git clone https://github.com/scrooloose/nerdtree.git && \
62-
git clone https://github.com/vim-syntastic/syntastic.git && \
63-
git clone https://github.com/vim-airline/vim-airline.git && \
64-
git clone https://github.com/altercation/vim-colors-solarized.git && \
65-
git clone https://github.com/bazelbuild/vim-ft-bzl.git && \
66-
git clone https://github.com/google/vim-maktaba.git && \
67-
git clone https://github.com/google/vim-codefmt.git
68-
RUN curl -LSso ~/.vimrc https://gist.githubusercontent.com/llhe/71c5802919debd5825c100c0135478a7/raw/16a35020cc65f9c25d0cf8f11a3ba7b345a1271d/.vimrc
21+
RUN git clone --recursive https://github.com/llhe/vimrc.git && \
22+
cd vimrc && \
23+
rm -rf ~/.vim && \
24+
rm -rf ~/.vimrc && \
25+
ln -s `pwd`/vim ~/.vim && \
26+
ln -s `pwd`/vimrc ~/.vimrc
27+
6928

7029
# Upgrade CMake
71-
RUN wget https://cmake.org/files/v3.11/cmake-3.11.3-Linux-x86_64.tar.gz -P /tmp/ && \
30+
RUN wget -q https://cmake.org/files/v3.11/cmake-3.11.3-Linux-x86_64.tar.gz -P /tmp/ && \
7231
tar zxf /tmp/cmake-3.11.3-Linux-x86_64.tar.gz --strip-components=1 -C /usr/local/ && \
7332
update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force && \
7433
rm -f /tmp/cmake-3.11.3-Linux-x86_64.tar.gz
@@ -106,7 +65,7 @@ RUN cd /opt && \
10665

10766
# Mirror of https://cnbj1.fds.api.xiaomi.com/mace/third-party/gcc-linaro/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz
10867
RUN cd /opt && \
109-
wget -q https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz
68+
wget -q https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz && \
11069
tar xf gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz && \
11170
rm -rf gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz
11271

‎docker/update_images.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ if [ $BUILD_DIR_NAME != $CURRENT_DIR_NAME ]; then
1111
fi
1212

1313
# build images
14-
docker build -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev-lite ./mace-dev-lite || exit 1
15-
docker build -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev ./mace-dev-lite || exit 1
16-
docker build -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/gitlab-runner ./gitlab-runner || exit 1
14+
docker build --network host -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev-lite ./mace-dev-lite
15+
docker build --network host -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev ./mace-dev
16+
docker build --network host -t registry.cn-hangzhou.aliyuncs.com/xiaomimace/gitlab-runner ./gitlab-runner
1717

1818
if grep -lq registry.cn-hangzhou.aliyuncs.com ~/.docker/config.json; then
1919
# update images to repository
20-
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev-lite || exit 1
21-
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev || exit 1
22-
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/gitlab-runner || exit 1
20+
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev-lite
21+
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev
22+
docker push registry.cn-hangzhou.aliyuncs.com/xiaomimace/gitlab-runner
2323
else
2424
echo "Login docker registry server is needed!"
2525
exit 1

0 commit comments

Comments
 (0)