Skip to content
Snippets Groups Projects
Commit 341b31e8 authored by Yuki Okushi's avatar Yuki Okushi
Browse files

Tweak Dockerfile to fix android CI

parent a410c35f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ci/docker/aarch64-linux-android/Dockerfile
+ 5
− 6
View file @ 341b31e8
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 \ curl \
ca-certificates \ ca-certificates \
...@@ -12,9 +13,7 @@ RUN dpkg --add-architecture i386 && \ ...@@ -12,9 +13,7 @@ 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/
......
ci/docker/arm-linux-androideabi/Dockerfile
+ 5
− 6
View file @ 341b31e8
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 \ curl \
ca-certificates \ ca-certificates \
...@@ -12,9 +13,7 @@ RUN dpkg --add-architecture i386 && \ ...@@ -12,9 +13,7 @@ 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/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment