diff --git a/docker/mace-dev-lite/Dockerfile b/docker/mace-dev-lite/Dockerfile index a2fa1b6388e32d1a8a0f16b54ca723241dacef07..17068ee0f848982eabbb2d9648a1f5b504b0b67b 100644 --- a/docker/mace-dev-lite/Dockerfile +++ b/docker/mace-dev-lite/Dockerfile @@ -85,8 +85,7 @@ RUN cd /opt/ && \ rm -f android-ndk-r15c-linux-x86_64.zip ENV ANDROID_NDK_VERSION r15c -ENV ANDROID_NDK /opt/android-ndk-${ANDROID_NDK_VERSION} -ENV ANDROID_NDK_HOME ${ANDROID_NDK} +ENV ANDROID_NDK_HOME /opt/android-ndk-${ANDROID_NDK_VERSION} # add to PATH ENV PATH ${PATH}:${ANDROID_NDK_HOME} @@ -104,3 +103,7 @@ RUN pip install -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com sh==1.12.14 \ pycodestyle==2.4.0 \ filelock + +# fix docker in docker error: `error while loading shared libraries: libltdl.so.7` +# refer to: https://github.com/jenkinsci/docker/issues/506 +RUN apt-get install -y libltdl7 diff --git a/docker/mace-dev/Dockerfile b/docker/mace-dev/Dockerfile index b3e5bf95fb7a5d4c30beb215f3e3382802aff182..1f73dcefe494e2b1e3d6d82054b99d72b1fa3352 100644 --- a/docker/mace-dev/Dockerfile +++ b/docker/mace-dev/Dockerfile @@ -44,3 +44,8 @@ RUN cd /opt/ && \ wget -q https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip && \ unzip -q android-ndk-r16-linux-x86_64.zip && \ rm -f android-ndk-r16-linux-x86_64.zip +## Download other NDK r17b +RUN cd /opt/ && \ + wget -q https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip && \ + unzip -q android-ndk-r17b-linux-x86_64.zip && \ + rm -f android-ndk-r17b-linux-x86_64.zip diff --git a/docs/installation/using_docker.rst b/docs/installation/using_docker.rst index 9e1ebf6006f5d73a0baca4246088bc03eba72272..61e929a33b5f14bf58a1fb74fb13e0598919cd3c 100644 --- a/docs/installation/using_docker.rst +++ b/docs/installation/using_docker.rst @@ -45,6 +45,8 @@ Create container with the following command docker run -it --privileged -d --name mace-dev \ -v /dev/bus/usb:/dev/bus/usb --net=host \ -v /local/path:/container/path \ + -v /usr/bin/docker:/usr/bin/docker \ + -v /var/run/docker.sock:/var/run/docker.sock \ registry.cn-hangzhou.aliyuncs.com/xiaomimace/mace-dev-lite # Execute an interactive bash shell on the container docker exec -it mace-dev /bin/bash