diff --git a/Dockerfile b/Dockerfile index 3882a0c66dde3d941901010d1659f397e48c9980..027970fc8f4375a6c74f50734f9c128a2b53446c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM debian:stretch +FROM debian:stretch-slim +# buster brings opendjk-11 which sdkmanager is currently not compatible with +# see https://stackoverflow.com/q/46402772 ENV LANG=C.UTF-8 ENV DEBIAN_FRONTEND=noninteractive diff --git a/install.sh b/install.sh index 3781a86cf644ea99339588571cbf2d28e250087e..325cb88eb765a484c19432ef5d38ed58f6df40cd 100755 --- a/install.sh +++ b/install.sh @@ -15,6 +15,9 @@ echo "path-exclude=/usr/share/doc/*" >> /etc/dpkg/dpkg.cfg.d/01_nodoc apt-get update apt-get -y upgrade +# install of default-jdk-headless fails otherwise on *-slim image +mkdir -p /usr/share/man/man1 + # install Debian packages apt-get install -y --no-install-recommends \ git \ @@ -32,8 +35,8 @@ rm -rf /var/lib/apt/lists/* # Android Part # ################ -# Install Android SDK Manager (tools 26.1.1) -wget --no-verbose -O tools.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip +# Install Android SDK Manager +wget --no-verbose -O tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip unzip tools.zip rm tools.zip mkdir ${ANDROID_HOME} @@ -49,5 +52,5 @@ printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c mkdir /root/.android touch /root/.android/repositories.cfg echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" -echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;28.0.3" -echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-28" +echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;29.0.2" +echo y | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-29"