Tweak Dockerfile to install packages correctly
This commit is contained in:
parent
7fe3f30982
commit
b34c268ba1
|
@ -26,7 +26,6 @@ RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
|
||||||
RUN mv /root/.android /tmp
|
RUN mv /root/.android /tmp
|
||||||
RUN chmod 777 -R /tmp/.android
|
RUN chmod 777 -R /tmp/.android
|
||||||
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
|
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
|
||||||
RUN ls -a /android/sdk/platform-tools
|
|
||||||
|
|
||||||
ENV PATH=$PATH:/rust/bin \
|
ENV PATH=$PATH:/rust/bin \
|
||||||
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
|
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
|
||||||
|
|
|
@ -26,7 +26,6 @@ RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
|
||||||
RUN mv /root/.android /tmp
|
RUN mv /root/.android /tmp
|
||||||
RUN chmod 777 -R /tmp/.android
|
RUN chmod 777 -R /tmp/.android
|
||||||
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
|
RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
|
||||||
RUN ls -a /android/sdk/platform-tools
|
|
||||||
|
|
||||||
ENV PATH=$PATH:/rust/bin \
|
ENV PATH=$PATH:/rust/bin \
|
||||||
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
|
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
RUN dpkg --add-architecture i386 && \
|
RUN dpkg --add-architecture i386
|
||||||
apt-get update && \
|
RUN apt-get update
|
||||||
apt-get install -y --no-install-recommends \
|
RUN apt-get install -y --no-install-recommends libc6-dev gcc
|
||||||
|
RUN apt-get install -y --no-install-recommends \
|
||||||
file \
|
file \
|
||||||
curl \
|
wget \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
python3 \
|
python3 \
|
||||||
python3-distutils \
|
python3-distutils \
|
||||||
|
@ -12,15 +13,13 @@ RUN dpkg --add-architecture i386 && \
|
||||||
expect \
|
expect \
|
||||||
openjdk-8-jre \
|
openjdk-8-jre \
|
||||||
libstdc++6:i386 \
|
libstdc++6:i386 \
|
||||||
libpulse0 \
|
libpulse0
|
||||||
gcc \
|
|
||||||
libc6-dev
|
|
||||||
|
|
||||||
WORKDIR /android/
|
WORKDIR /android/
|
||||||
COPY android* /android/
|
COPY android* /android/
|
||||||
|
|
||||||
ENV ANDROID_ARCH=i686
|
ENV ANDROID_ARCH=i686
|
||||||
ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/cmdline-tools/tools:/android/sdk/cmdline-tools/platform-tools
|
ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/cmdline-tools/tools:/android/sdk/platform-tools
|
||||||
|
|
||||||
RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
|
RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
|
||||||
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
|
RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
|
||||||
|
|
Loading…
Reference in New Issue