From b34c268ba1a9583e218b98becbfdb88bc91c265e Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Sat, 17 Oct 2020 07:22:59 +0900
Subject: [PATCH] Tweak Dockerfile to install packages correctly
---
ci/docker/aarch64-linux-android/Dockerfile | 1 -
ci/docker/arm-linux-androideabi/Dockerfile | 1 -
ci/docker/i686-linux-android/Dockerfile | 15 +++++++--------
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile
index d5396a32..56685c54 100644
--- a/ci/docker/aarch64-linux-android/Dockerfile
+++ b/ci/docker/aarch64-linux-android/Dockerfile
@@ -26,7 +26,6 @@ RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
RUN mv /root/.android /tmp
RUN chmod 777 -R /tmp/.android
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 \
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android28-clang \
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
index 25f76d2c..cee5882d 100644
--- a/ci/docker/arm-linux-androideabi/Dockerfile
+++ b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -26,7 +26,6 @@ RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
RUN mv /root/.android /tmp
RUN chmod 777 -R /tmp/.android
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 \
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
index c9145921..050be415 100644
--- a/ci/docker/i686-linux-android/Dockerfile
+++ b/ci/docker/i686-linux-android/Dockerfile
@@ -1,10 +1,11 @@
FROM ubuntu:20.04
-RUN dpkg --add-architecture i386 && \
- apt-get update && \
- apt-get install -y --no-install-recommends \
+RUN dpkg --add-architecture i386
+RUN apt-get update
+RUN apt-get install -y --no-install-recommends libc6-dev gcc
+RUN apt-get install -y --no-install-recommends \
file \
- curl \
+ wget \
ca-certificates \
python3 \
python3-distutils \
@@ -12,15 +13,13 @@ RUN dpkg --add-architecture i386 && \
expect \
openjdk-8-jre \
libstdc++6:i386 \
- libpulse0 \
- gcc \
- libc6-dev
+ libpulse0
WORKDIR /android/
COPY android* /android/
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-sdk.sh $ANDROID_ARCH
--
GitLab