Make that docker images download android's ndk/sdk into a writable us…

…er location Because we have some recipes that needs to interact with files in there, and we will get permission errors if those files are downloaded into a non user writable directory
opacam · Jan 28, 2019 · ad9c35a · ad9c35a
1 parent 3695853
commit ad9c35a
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 84 deletions.
diff --git a/Dockerfile.py2 b/Dockerfile.py2
@@ -17,14 +17,53 @@
 
 FROM ubuntu:18.04
 
-ENV ANDROID_HOME="/opt/android"
-
 RUN apt -y update -qq \
     && apt -y install -qq --no-install-recommends curl unzip \
     && apt -y autoremove \
     && apt -y clean
 
+# install system dependencies
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        python virtualenv python-pip wget lbzip2 patch sudo \
+    && apt -y autoremove \
+    && apt -y clean
+
+# build dependencies
+# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
+RUN dpkg --add-architecture i386 \
+    && apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        build-essential ccache git python2.7 python2.7-dev \
+        libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
+        libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
+        zip zlib1g-dev zlib1g:i386 \
+    && apt -y autoremove \
+    && apt -y clean
+
+# specific recipes dependencies (e.g. libffi requires autoreconf binary)
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
+    && apt -y autoremove \
+    && apt -y clean
+
+
+# set user env
+ENV USER="user"
+ENV HOME_DIR="/home/${USER}"
+ENV WORK_DIR="${HOME_DIR}" \
+    PATH="${HOME_DIR}/.local/bin:${PATH}"
+
+# prepare non root env
+RUN useradd --create-home --shell /bin/bash ${USER}
 
+# with sudo access and no password
+RUN usermod -append --groups sudo ${USER}
+RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+# set android env
+ENV ANDROID_HOME="${HOME_DIR}/android"
 ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
 ENV ANDROID_NDK_VERSION="17c"
 ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
@@ -78,46 +117,6 @@ RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-19" && \
     chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
 
 
-ENV USER="user"
-ENV HOME_DIR="/home/${USER}"
-ENV WORK_DIR="${HOME_DIR}" \
-    PATH="${HOME_DIR}/.local/bin:${PATH}"
-
-# install system dependencies
-RUN apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        python virtualenv python-pip wget lbzip2 patch sudo \
-    && apt -y autoremove \
-    && apt -y clean
-
-# build dependencies
-# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
-RUN dpkg --add-architecture i386 \
-    && apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        build-essential ccache git python2.7 python2.7-dev \
-        libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
-        libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
-        zip zlib1g-dev zlib1g:i386 \
-    && apt -y autoremove \
-    && apt -y clean
-
-# specific recipes dependencies (e.g. libffi requires autoreconf binary)
-RUN apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
-    && apt -y autoremove \
-    && apt -y clean
-
-
-# prepare non root env
-RUN useradd --create-home --shell /bin/bash ${USER}
-
-# with sudo access and no password
-RUN usermod -append --groups sudo ${USER}
-RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-
 RUN pip install --upgrade cython==0.28.6
 
 WORKDIR ${WORK_DIR}

diff --git a/Dockerfile.py3 b/Dockerfile.py3
@@ -17,14 +17,52 @@
 
 FROM ubuntu:18.04
 
-ENV ANDROID_HOME="/opt/android"
-
 RUN apt -y update -qq \
     && apt -y install -qq --no-install-recommends curl unzip \
     && apt -y autoremove \
     && apt -y clean
 
+# install system dependencies
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        python3 virtualenv python3-pip wget lbzip2 patch sudo \
+    && apt -y autoremove \
+    && apt -y clean
+
+# build dependencies
+# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
+RUN dpkg --add-architecture i386 \
+    && apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        build-essential ccache git python3 python3-dev \
+        libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
+        libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
+        zip zlib1g-dev zlib1g:i386 \
+    && apt -y autoremove \
+    && apt -y clean
+
+# specific recipes dependencies (e.g. libffi requires autoreconf binary)
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
+    && apt -y autoremove \
+    && apt -y clean
 
+# set user env
+ENV USER="user"
+ENV HOME_DIR="/home/${USER}"
+ENV WORK_DIR="${HOME_DIR}" \
+    PATH="${HOME_DIR}/.local/bin:${PATH}"etc/sudoers
+
+# prepare non root env
+RUN useradd --create-home --shell /bin/bash ${USER}
+
+# with sudo access and no password
+RUN usermod -append --groups sudo ${USER}
+RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+# set android env
+ENV ANDROID_HOME="${HOME_DIR}/android"
 ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
 ENV ANDROID_NDK_VERSION="17c"
 ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
@@ -78,46 +116,6 @@ RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-19" && \
     chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
 
 
-ENV USER="user"
-ENV HOME_DIR="/home/${USER}"
-ENV WORK_DIR="${HOME_DIR}" \
-    PATH="${HOME_DIR}/.local/bin:${PATH}"
-
-# install system dependencies
-RUN apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        python3 virtualenv python3-pip wget lbzip2 patch sudo \
-    && apt -y autoremove \
-    && apt -y clean
-
-# build dependencies
-# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
-RUN dpkg --add-architecture i386 \
-    && apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        build-essential ccache git python3 python3-dev \
-        libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
-        libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
-        zip zlib1g-dev zlib1g:i386 \
-    && apt -y autoremove \
-    && apt -y clean
-
-# specific recipes dependencies (e.g. libffi requires autoreconf binary)
-RUN apt -y update -qq \
-    && apt -y install -qq --no-install-recommends \
-        libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
-    && apt -y autoremove \
-    && apt -y clean
-
-
-# prepare non root env
-RUN useradd --create-home --shell /bin/bash ${USER}
-
-# with sudo access and no password
-RUN usermod -append --groups sudo ${USER}
-RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-
 RUN pip3 install --upgrade cython==0.28.6
 
 WORKDIR ${WORK_DIR}