summaryrefslogtreecommitdiff
path: root/docker/android-emulator/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/android-emulator/Dockerfile')
-rw-r--r--docker/android-emulator/Dockerfile13
1 files changed, 5 insertions, 8 deletions
diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile
index 138173d4..b5f5f32b 100644
--- a/docker/android-emulator/Dockerfile
+++ b/docker/android-emulator/Dockerfile
@@ -1,7 +1,7 @@
-FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest
+FROM registry.0xacab.org/leap/bitmask_android/android-sdk:latest
MAINTAINER LEAP Encryption Access Project <info@leap.se>
-LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="26"
+LABEL Description="Android SDK baseimage based on debian:bullseye" Vendor="LEAP" Version="27"
# Make sure debconf doesn't complain about lack of interactivity
ENV DEBIAN_FRONTEND noninteractive
@@ -15,12 +15,9 @@ ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
RUN apt-get update -qq && \
apt-get -y dist-upgrade && \
apt-get -y install gnupg apt-transport-https
-RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
- echo \
- "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
- $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+
RUN apt-get update -qq && \
- apt-get -y install docker-ce mesa-utils && \
+ apt-get install -y docker-ce docker-ce-cli mesa-utils && \
apt-get clean && \
apt-get autoclean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -38,4 +35,4 @@ RUN echo y | sdkmanager "system-images;android-30;google_apis;x86"
# RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64"
# RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64"
-RUN echo no | avdmanager create avd --force --name testApi30 --abi google_apis/x86 --package 'system-images;android-30;google_apis;x86' \ No newline at end of file
+RUN echo no | avdmanager create avd --force --name testApi30 --abi google_apis/x86 --package 'system-images;android-30;google_apis;x86'