aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashanth Swaminathan <prashanthsw@google.com>2024-02-07 23:50:16 -0800
committerPrashanth Swaminathan <prashanthsw@google.com>2024-02-07 23:50:16 -0800
commit75dc840d93d4a647e08d241015292a177334c5a4 (patch)
tree360070e4df1aa95b6ecd85f8ac4d15b4f8f225a4
parent8e1f260925118a3d7ab68ac496032a7e4bd8fadc (diff)
downloadndkports-75dc840d93d4a647e08d241015292a177334c5a4.tar.gz
Update Docker build to use latest dependencies
Building against newer NDKs requires updated versions of cmake, which are unavailable in Debian stretch. Further, the base image now installs it's own Python without SSL. Update Docker to use the latest LTS Ubuntu image and update the required apt dependencies. Test: ./scripts/build_release.sh Change-Id: I609d85826e29c37ff8f029364bb584e8dec99c62
-rw-r--r--Dockerfile10
1 files changed, 8 insertions, 2 deletions
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"]