commit d8fd22a99242045d781d0636c5ee622ffe32a679
author Prashanth Swaminathan <prashanthsw@google.com> Fri Feb 23 05:06:36 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 23 05:06:36 2024 +0000
tree 360070e4df1aa95b6ecd85f8ac4d15b4f8f225a4
parent a2c13960ad220f47b0479caae7047c9d9fcc5ee4
parent fb9b1230148076e4390d5b445dcd6f15ee5ce27b

Update Docker build to use latest dependencies am: 75dc840d93 am: fb9b123014

Original change: https://android-review.googlesource.com/c/platform/tools/ndkports/+/2955933

Change-Id: I4826a0ee92a2374bfc77fb0d2af6b714ed496a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 644c120..4491c22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,23 @@
-FROM gcr.io/cloud-builders/javac:8
+FROM ubuntu:22.04
 
+# Install tools required for port tasks.
 RUN apt-get update && apt-get install -y \
     cmake \
     curl \
     ninja-build \
-    python3-pip
+    openjdk-8-jdk \
+    python3-pip \
+    zip
 RUN pip3 install meson
+
+# Install ADB for tests.
 RUN curl -L -o platform-tools.zip \
     https://dl.google.com/android/repository/platform-tools-latest-linux.zip
 RUN unzip platform-tools.zip platform-tools/adb
 RUN mv platform-tools/adb /usr/bin/adb
 RUN mkdir -m 0750 /.android
 
+# Build release artifacts.
 WORKDIR /src
 ENTRYPOINT ["./gradlew", "--no-daemon", "--gradle-user-home=.gradle_home", "--stacktrace", "-PndkPath=/ndk"]
 CMD ["-Prelease", "clean", "release"]