Skip to content

Commit ad9a6d0

Browse files
KeyWeeUsrKeyWeeUsr
authored
Merge pull request #1471 from kivy/remove_crystax_docker
Remove crystax docker and optimize Dockerfile
2 parents 54714ef + df60061 commit ad9a6d0

File tree

2 files changed

+97
-70
lines changed

2 files changed

+97
-70
lines changed

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ env:
1717
global:
1818
- ANDROID_SDK_HOME=/opt/android/android-sdk
1919
- ANDROID_NDK_HOME=/opt/android/android-ndk
20-
- CRYSTAX_NDK_HOME=/opt/android/crystax-ndk
2120
matrix:
2221
- 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'
2322
# overrides requirements to skip `peewee` pure python module, see:
2423
# https://github.com/kivy/python-for-android/issues/1263#issuecomment-390421054
2524
- 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'
2625
- 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'
27-
- 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'
2826
# builds only the recipes that moved
2927
- COMMAND='. venv/bin/activate && ./ci/rebuild_updated_recipes.py'
3028

‎Dockerfile

Lines changed: 97 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,132 @@
11
# Dockerfile with:
22
# - Android build environment
33
# - python-for-android dependencies
4+
#
45
# Build with:
5-
# docker build --tag=p4a .
6+
# docker build --tag=p4a .
7+
#
68
# Run with:
7-
# docker run p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
9+
# docker run -it --rm p4a /bin/sh -c '. venv/bin/activate && p4a apk --help'
10+
#
811
# Or for interactive shell:
9-
# docker run -it --rm p4a
12+
# docker run -it --rm p4a
13+
#
14+
# Note:
15+
# Use 'docker run' without '--rm' flag for keeping the container and use
16+
# 'docker commit <container hash> <new image>' to extend the original image
17+
1018
FROM ubuntu:18.04
1119

20+
ENV ANDROID_HOME="/opt/android"
1221

13-
ENV USER="user"
14-
ENV HOME_DIR="/home/${USER}"
15-
ENV WORK_DIR="${HOME_DIR}" \
16-
PATH="${HOME_DIR}/.local/bin:${PATH}"
17-
# get the latest version from https://developer.android.com/ndk/downloads/index.html
22+
RUN apt -y update -qq \
23+
&& apt -y install -qq --no-install-recommends curl unzip \
24+
&& apt -y autoremove \
25+
&& apt -y clean
26+
27+
28+
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
1829
ENV ANDROID_NDK_VERSION="16b"
19-
# get the latest version from https://www.crystax.net/en/download
20-
ENV CRYSTAX_NDK_VERSION="10.3.2"
21-
# get the latest version from https://developer.android.com/studio/index.html
22-
ENV ANDROID_SDK_TOOLS_VERSION="3859397"
30+
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
2331

24-
ENV ANDROID_HOME="/opt/android"
25-
ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk" \
26-
CRYSTAX_NDK_HOME="${ANDROID_HOME}/crystax-ndk" \
27-
ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
28-
ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}" \
29-
CRYSTAX_NDK_HOME_V="${CRYSTAX_NDK_HOME}-${CRYSTAX_NDK_VERSION}"
30-
ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip" \
31-
CRYSTAX_NDK_ARCHIVE="crystax-ndk-${CRYSTAX_NDK_VERSION}-linux-x86.tar.xz" \
32-
ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
33-
ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}" \
34-
CRYSTAX_NDK_DL_URL="https://eu.crystax.net/download/${CRYSTAX_NDK_ARCHIVE}" \
35-
ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
32+
# get the latest version from https://developer.android.com/ndk/downloads/index.html
33+
ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip"
34+
ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
3635

37-
# install system dependencies
38-
RUN apt update -qq && apt install -qq --yes --no-install-recommends \
39-
python virtualenv python-pip wget curl lbzip2 patch bsdtar sudo && \
40-
rm -rf /var/lib/apt/lists/*
36+
# download and install Android NDK
37+
RUN curl --location --progress-bar --insecure \
38+
"${ANDROID_NDK_DL_URL}" \
39+
--output "${ANDROID_NDK_ARCHIVE}" \
40+
&& mkdir --parents "${ANDROID_NDK_HOME_V}" \
41+
&& unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
42+
&& ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
43+
&& rm -rf "${ANDROID_NDK_ARCHIVE}"
4144

42-
# build dependencies
43-
# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
44-
RUN dpkg --add-architecture i386 && apt update -qq && apt install -qq --yes --no-install-recommends \
45-
build-essential ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
46-
libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
47-
openjdk-8-jdk zip unzip zlib1g-dev zlib1g:i386
4845

49-
# specific recipes dependencies (e.g. libffi requires autoreconf binary)
50-
RUN apt install -qq --yes --no-install-recommends \
51-
autoconf automake cmake gettext libltdl-dev libtool pkg-config && \
52-
rm -rf /var/lib/apt/lists/*
46+
ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
5347

54-
# download and install Android NDK
55-
RUN curl --location --progress-bar "${ANDROID_NDK_DL_URL}" --output "${ANDROID_NDK_ARCHIVE}" && \
56-
mkdir --parents "${ANDROID_NDK_HOME_V}" && \
57-
unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" && \
58-
ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" && \
59-
rm -rf "${ANDROID_NDK_ARCHIVE}"
60-
61-
# download and install CrystaX NDK
62-
# added `gnutls_handshake` flag to workaround random `gnutls_handshake()` issues
63-
RUN curl --location --progress-bar "${CRYSTAX_NDK_DL_URL}" --output "${CRYSTAX_NDK_ARCHIVE}" --insecure && \
64-
bsdtar -xf "${CRYSTAX_NDK_ARCHIVE}" --directory "${ANDROID_HOME}" \
65-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/docs \
66-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/samples \
67-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/tests \
68-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/renderscript \
69-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/x86_64-* \
70-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/llvm-* \
71-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/aarch64-* \
72-
--exclude=crystax-ndk-${CRYSTAX_NDK_VERSION}/toolchains/mips64el-* && \
73-
ln -sfn "${CRYSTAX_NDK_HOME_V}" "${CRYSTAX_NDK_HOME}" && \
74-
rm -rf "${CRYSTAX_NDK_ARCHIVE}"
48+
# get the latest version from https://developer.android.com/studio/index.html
49+
ENV ANDROID_SDK_TOOLS_VERSION="3859397"
50+
ENV ANDROID_SDK_TOOLS_ARCHIVE="sdk-tools-linux-${ANDROID_SDK_TOOLS_VERSION}.zip"
51+
ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
7552

7653
# download and install Android SDK
77-
RUN curl --location --progress-bar "${ANDROID_SDK_TOOLS_DL_URL}" --output "${ANDROID_SDK_TOOLS_ARCHIVE}" && \
78-
mkdir --parents "${ANDROID_SDK_HOME}" && \
79-
unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" && \
80-
rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
54+
RUN curl --location --progress-bar --insecure \
55+
"${ANDROID_SDK_TOOLS_DL_URL}" \
56+
--output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
57+
&& mkdir --parents "${ANDROID_SDK_HOME}" \
58+
&& unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
59+
&& rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
8160

8261
# update Android SDK, install Android API, Build Tools...
83-
RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" && \
84-
echo '### User Sources for Android SDK Manager' > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
85-
RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses
62+
RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
63+
&& echo '### User Sources for Android SDK Manager' \
64+
> "${ANDROID_SDK_HOME}/.android/repositories.cfg"
65+
66+
# accept Android licenses (JDK necessary!)
67+
RUN apt -y update -qq \
68+
&& apt -y install -qq --no-install-recommends openjdk-8-jdk \
69+
&& apt -y autoremove \
70+
&& apt -y clean
71+
RUN yes | "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" --licenses > /dev/null
72+
73+
# download platforms, API, build tools
8674
RUN "${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-19" && \
8775
"${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "platforms;android-27" && \
8876
"${ANDROID_SDK_HOME}/tools/bin/sdkmanager" "build-tools;26.0.2" && \
8977
chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
9078

79+
80+
ENV USER="user"
81+
ENV HOME_DIR="/home/${USER}"
82+
ENV WORK_DIR="${HOME_DIR}" \
83+
PATH="${HOME_DIR}/.local/bin:${PATH}"
84+
85+
# install system dependencies
86+
RUN apt -y update -qq \
87+
&& apt -y install -qq --no-install-recommends \
88+
python virtualenv python-pip wget lbzip2 patch sudo \
89+
&& apt -y autoremove \
90+
&& apt -y clean
91+
92+
# build dependencies
93+
# https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
94+
RUN dpkg --add-architecture i386 \
95+
&& apt -y update -qq \
96+
&& apt -y install -qq --no-install-recommends \
97+
build-essential ccache git python2.7 python2.7-dev \
98+
libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 \
99+
libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
100+
zip zlib1g-dev zlib1g:i386 \
101+
&& apt -y autoremove \
102+
&& apt -y clean
103+
104+
# specific recipes dependencies (e.g. libffi requires autoreconf binary)
105+
RUN apt -y update -qq \
106+
&& apt -y install -qq --no-install-recommends \
107+
autoconf automake cmake gettext libltdl-dev libtool pkg-config \
108+
&& apt -y autoremove \
109+
&& apt -y clean
110+
111+
91112
# prepare non root env
92113
RUN useradd --create-home --shell /bin/bash ${USER}
114+
93115
# with sudo access and no password
94116
RUN usermod -append --groups sudo ${USER}
95117
RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
96-
RUN pip install --quiet --upgrade cython==0.28.6
118+
119+
120+
RUN pip install --upgrade cython==0.28.6
121+
97122
WORKDIR ${WORK_DIR}
98123
COPY . ${WORK_DIR}
124+
99125
# user needs ownership/write access to these directories
100126
RUN chown --recursive ${USER} ${WORK_DIR} ${ANDROID_SDK_HOME}
101127
USER ${USER}
128+
102129
# install python-for-android from current branch
103-
RUN virtualenv --python=python venv && . venv/bin/activate && pip install --quiet -e .
130+
RUN virtualenv --python=python venv \
131+
&& . venv/bin/activate \
132+
&& pip install -e .

0 commit comments

Comments
 (0)