Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d54b6a2 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Update docker image and remove unneeded stuff

parent cf0277b8
Loading
Loading
Loading
Loading
+13 −45
Original line number Diff line number Diff line
FROM ubuntu:20.04

# Global Gradle arguments
ARG GRADLE_VERSION="8.0"
ARG GRADLE_DIST=bin
ARG GRADLE_HOME="/gradle"
ARG GRADLE_PATH="${GRADLE_HOME}/gradle-${GRADLE_VERSION}/bin"
FROM ubuntu:24.04

# Global Android SDK arguments and environment variables
ARG ANDROID_SDK_VERSION=7583922
ENV ANDROID_SDK_ROOT "/sdk"
ENV ANDROID_HOME "/sdk"
ARG ANDROID_SDK_VERSION=13114758
ENV ANDROID_SDK_ROOT="/sdk"
ENV ANDROID_HOME="/sdk"
ARG ANDROID_CMDLINE_TOOLS_BIN="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin"

# Add Gradle and SDK tools to the PATH
ENV PATH "$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${GRADLE_PATH}/:${ANDROID_HOME}/emulator/:${ANDROID_HOME}/platform-tools/:${ANDROID_HOME}/build-tools/31.0.0/"
ENV PATH="$PATH:${ANDROID_CMDLINE_TOOLS_BIN}/:${ANDROID_HOME}/platform-tools/:${ANDROID_HOME}/build-tools/35.0.0/"

# Setup distribution and install required distribution packages
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN dpkg --print-architecture && \
	dpkg --print-foreign-architectures
@@ -26,37 +20,15 @@ RUN dpkg --add-architecture i386 && \

RUN apt-get -qq update && \
    apt-get install -qqy --no-install-recommends \
      git-lfs \
      openssh-client \
      curl \
      git-core \
      openjdk-11-jdk \
      openjdk-17-jdk \
      libc6-i386 \
      libstdc++6:i386 \
      zlib1g:i386 \
      unzip \
      make \
      locales \
      autoconf \
      automake \
      libtool \
      pkg-config \
      wget \
      gcc \
      libsonic-dev \
      libpcaudio-dev \
      zip \
      jq \
      aapt \
      python3 \
      python3-pip \
      apksigner 

RUN pip3 install requests beautifulsoup4
      aapt apksigner autoconf automake curl gcc git-core git-lfs \
      jq libpcaudio-dev libsonic-dev libstdc++6:i386 libc6-i386 \
      libtool locales make openjdk-11-jdk openjdk-17-jdk \
      openjdk-21-jdk openjdk-8-jdk openssh-client pkg-config \
      python3 python3-bs4 python3-requests unzip wget zip zlib1g:i386

RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANG=en_US.UTF-8
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64

RUN rm -f /etc/ssl/certs/java/cacerts; \
    /var/lib/dpkg/info/ca-certificates-java.postinst configure
@@ -76,7 +48,3 @@ RUN mkdir -p /root/.android \

ADD packages.txt /sdk
RUN sdkmanager --verbose --package_file=/sdk/packages.txt

# Download and install Gradle
# Keep it aligned default version as given in https://developer.android.com/studio/releases/gradle-plugin#versioning-update
RUN wget -q https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-${GRADLE_DIST}.zip -O /gradle.zip && unzip /gradle.zip -d /gradle
+3 −2
Original line number Diff line number Diff line
build-tools;31.0.0
platforms;android-31
 No newline at end of file
build-tools;35.0.0
platforms;android-35
platform-tools