Fix Dockerifle

heitorgo1 · heitorgo1 · commit 7e5e64a508dc · 2019-06-04T14:02:56.000-03:00
diff --git a/pythonforandroid/recipes/grpc/Dockerfile b/pythonforandroid/recipes/grpc/Dockerfile
@@ -286,54 +286,32 @@ RUN mkdir -p "${BUILD_DIR}" && cd "${BUILD_DIR}" \
   && ln -sf /opt/android/android-ndk/platforms/android-21/arch-arm/usr/lib/libc.so /opt/android/android-ndk/platforms/android-21/arch-arm/usr/lib/librt.so
 
 # Python and user packages
-
 ENV USER="user"
 ENV HOME_DIR="/home/${USER}"
 ENV WORK_DIR="${HOME_DIR}" \
     PATH="${HOME_DIR}/.local/bin:${PATH}"
 
-# Install python 3.7 dependencies
-RUN ${RETRY} apt -y install -qq --no-install-recommends \
-        build-essential zlib1g-dev \
-        libncurses5-dev libgdbm-dev \
-        libnss3-dev libssl-dev \
-        libreadline-dev libffi-dev wget \
-        && apt -y autoremove
-
-# Install python 3.7
-RUN wget https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz \
-    && tar -xf Python-3.7.3.tar.xz && cd Python-3.7.3 \
-    && ./configure --enable-optimizations \
-    && make -j "${N_JOBS}" \
-    && make altinstall
-
-RUN python3.7 --version
-RUN pip --version
-
-# Install virtualenv
-RUN pip install --upgrade virtualenv
-
-
 # install system dependencies
 RUN ${RETRY} apt -y install -qq --no-install-recommends \
-        wget lbzip2 patch sudo \
-    && apt -y autoremove
+python3 virtualenv python3-pip python3-venv \
+wget lbzip2 patch sudo \
+&& apt -y autoremove
 
 # build dependencies
 # https://buildozer.readthedocs.io/en/latest/installation.html#android-on-ubuntu-16-04-64bit
 RUN dpkg --add-architecture i386 \
-    && ${RETRY} apt -y update -qq \
-    && ${RETRY} apt -y install -qq --no-install-recommends \
-        build-essential ccache git \
+&& ${RETRY} apt -y update -qq \
+&& ${RETRY} 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
+                libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 \
+                        zip zlib1g-dev zlib1g:i386 \
+                            && apt -y autoremove
 
 # specific recipes dependencies (e.g. libffi requires autoreconf binary)
 RUN ${RETRY} apt -y install -qq --no-install-recommends \
-        libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
-    && apt -y autoremove \
+libffi-dev autoconf automake cmake gettext libltdl-dev libtool pkg-config \
+&& apt -y autoremove \
     && apt -y clean
 
 # prepare non root env
@@ -344,8 +322,8 @@ RUN usermod -append --groups sudo ${USER}
 RUN echo "%sudo ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 
-RUN pip install --upgrade --ignore-installed setuptools
-RUN pip install --upgrade cython==0.28.3
+RUN pip3 install --upgrade cython==0.28.3
+RUN pip3 install --upgrade --ignore-installed setuptools
 
 WORKDIR ${WORK_DIR}
 COPY --chown=user:user . ${WORK_DIR}
@@ -355,4 +333,5 @@ USER ${USER}
 # install python-for-android from current branch
 RUN virtualenv --python=python3 venv \
     && . venv/bin/activate \
-    && pip install -e .
+    && pip3 install --upgrade cython==0.28.3 \
+    && pip3 install -e .
