Merge pull request #1471 from kivy/remove_crystax_docker

Remove crystax docker and optimize Dockerfile

.travis.yml

@@ -17,14 +17,12 @@ env:
   global:
     - ANDROID_SDK_HOME=/opt/android/android-sdk
     - ANDROID_NDK_HOME=/opt/android/android-ndk
-    - CRYSTAX_NDK_HOME=/opt/android/crystax-ndk
   matrix:
     - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python3'
     # overrides requirements to skip `peewee` pure python module, see:
     # https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
     - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools'
     - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python2.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $ANDROID_NDK_HOME --bootstrap sdl2 --requirements python2,numpy'
-    - COMMAND='. venv/bin/activate && cd testapps/ && python setup_testapp_python3crystax.py apk --sdk-dir $ANDROID_SDK_HOME --ndk-dir $CRYSTAX_NDK_HOME --requirements python3crystax,setuptools,android,sdl2,pyjnius,kivy'
     # builds only the recipes that moved
     - COMMAND='. venv/bin/activate && ./ci/rebuild_updated_recipes.py'
 

Dockerfile

@@ -1,103 +1,132 @@
 # Dockerfile with:
 #   - Android build environment
 #   - python-for-android dependencies
+#
 # Build with:
-# docker build --tag=p4a .
+#     docker build --tag=p4a .
+#
 # Run with:
-# docker run p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
+#     docker run -it --rm p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
+#
 # Or for interactive shell:
-# docker run -it --rm p4a
+#     docker run -it --rm p4a
+#
+# Note:
+#     Use 'docker run' without '--rm' flag for keeping the container and use
+#     'docker commit <container hash> <new image>' to extend the original image
+
 FROM ubuntu:18.04
 
+ENV ANDROID_HOME="/opt/android"
 
-ENV USER="user"
-ENV HOME_DIR="/home/${USER}"
-ENV WORK_DIR="${HOME_DIR}" \
-    PATH="${HOME_DIR}/.local/bin:${PATH}"
-# get the latest version from https://developer.android.com/ndk/downloads/index.html
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends curl unzip \
+    && apt -y autoremove \
+    && apt -y clean
+
+
+ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
 ENV ANDROID_NDK_VERSION="16b"
-# get the latest version from https://www.crystax.net/en/download
-ENV CRYSTAX_NDK_VERSION="10.3.2"
-# get the latest version from https://developer.android.com/studio/index.html
-ENV ANDROID_SDK_TOOLS_VERSION="3859397"
+ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
 
-ENV ANDROID_HOME="/opt/android"
-ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
-    CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
-    ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
-ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
-    CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
-ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip" \
-    CRYSTAX_NDK_ARCHIVE="crystax-ndk-${CRYSTAX_NDK_VERSION}-linux-x86.tar.xz" \
-    ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
-ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}" \
-    CRYSTAX_NDK_DL_URL="https://eu.crystax.net/download/${CRYSTAX_NDK_ARCHIVE}" \
-    ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
+# get the latest version from https://developer.android.com/ndk/downloads/index.html
+ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip"
+ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
 
-# install system dependencies
-RUN apt update -qq && apt install -qq --yes --no-install-recommends \
-    python virtualenv python-pip wget curl lbzip2 patch bsdtar sudo && \
-    rm -rf /var/lib/apt/lists/*
+# download and install Android NDK
+RUN curl --location --progress-bar --insecure \
+        "${ANDROID_NDK_DL_URL}" \
+        --output "${ANDROID_NDK_ARCHIVE}" \
+    && mkdir --parents "${ANDROID_NDK_HOME_V}" \
+    && unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
+    && ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
+    && rm -rf "${ANDROID_NDK_ARCHIVE}"
 
-# build dependencies
-# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
-RUN dpkg --add-architecture i386 && apt update -qq && apt install -qq --yes --no-install-recommends \
-    build-essential ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
-    libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
-    openjdk-8-jdk zip unzip zlib1g-dev zlib1g:i386
 
-# specific recipes dependencies (e.g. libffi requires autoreconf binary)
-RUN apt install -qq --yes --no-install-recommends \
-    autoconf automake cmake gettext libltdl-dev libtool pkg-config && \
-    rm -rf /var/lib/apt/lists/*
+ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
 
-# download and install Android NDK
-RUN curl --location --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}" && \
-    mkdir --parents "${ANDROID_NDK_HOME_V}" && \
-    unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" && \
-    ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" && \
-    rm -rf "${ANDROID_NDK_ARCHIVE}"
-
-# download and install CrystaX NDK
-# added `gnutls_handshake` flag to workaround random `gnutls_handshake()` issues
-RUN curl --location --progress-bar "${CRYSTAX_NDK_DL_URL}" --output "${CRYSTAX_NDK_ARCHIVE}" --insecure && \
-    bsdtar -xf "${CRYSTAX_NDK_ARCHIVE}" --directory "${ANDROID_HOME}" \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/docs \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/samples \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/tests \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/renderscript \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/x86_64-* \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/llvm-* \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/aarch64-* \
-    --exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/mips64el-* && \
-    ln -sfn "${CRYSTAX_NDK_HOME_V}" "${CRYSTAX_NDK_HOME}" && \
-    rm -rf "${CRYSTAX_NDK_ARCHIVE}"
+# get the latest version from https://developer.android.com/studio/index.html
+ENV ANDROID_SDK_TOOLS_VERSION="3859397"
+ENV ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
+ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
 
 # download and install Android SDK
-RUN curl --location --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
-    mkdir --parents "${ANDROID_SDK_HOME}" && \
-    unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" && \
-    rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
+RUN curl --location --progress-bar --insecure \
+        "${ANDROID_SDK_TOOLS_DL_URL}" \
+        --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
+    && mkdir --parents "${ANDROID_SDK_HOME}" \
+    && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
+    && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
 
 # update Android SDK, install Android API, Build Tools...
-RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" && \
-    echo '### User Sources for Android SDK Manager' > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
-RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses
+RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
+    && echo '### User Sources for Android SDK Manager' \
+        > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
+
+# accept Android licenses (JDK necessary!)
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends openjdk-8-jdk \
+    && apt -y autoremove \
+    && apt -y clean
+RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses > /dev/null
+
+# download platforms, API, build tools
 RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-19" && \
     "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-27" && \
     "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;26.0.2" && \
     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 \
+        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 --quiet --upgrade cython==0.28.6
+
+
+RUN pip install --upgrade cython==0.28.6
+
 WORKDIR ${WORK_DIR}
 COPY . ${WORK_DIR}
+
 # user needs ownership/write access to these directories
 RUN chown --recursive ${USER} ${WORK_DIR} ${ANDROID_SDK_HOME}
 USER ${USER}
+
 # install python-for-android from current branch
-RUN virtualenv --python=python venv && . venv/bin/activate && pip install --quiet -e .
+RUN virtualenv --python=python venv \
+    && . venv/bin/activate \
+    && pip install -e .