diff options
Diffstat (limited to 'test-rig/Dockerfile')
| -rw-r--r-- | test-rig/Dockerfile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test-rig/Dockerfile b/test-rig/Dockerfile index c43abb5..b735d91 100644 --- a/test-rig/Dockerfile +++ b/test-rig/Dockerfile @@ -1,10 +1,8 @@ # scrcpy-android test image. # -# The unit target bundles JDK 17, Android cmdline-tools, platform 35, and -# build-tools 34+35. The e2e target adds the emulator, system image, and +# The unit target bundles JDK 17, Android cmdline-tools, platform 36, and +# build-tools 35 and 36. The e2e target adds the API 36 emulator image and # runtime libraries. JVM-only tests therefore do not download an emulator. -# build-tools 34 is AGP 8.7's internal pin; pre-installing it keeps -# gradle from downloading it into the SDK at test time. # Project is mounted at /work; runs in --rm mode. FROM debian:bookworm-slim@sha256:60eac759739651111db372c07be67863818726f754804b8707c90979bda511df AS unit @@ -16,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get install -y --no-install-recommends \ openjdk-17-jdk-headless \ - curl unzip ca-certificates \ + curl unzip ca-certificates git util-linux \ && rm -rf /var/lib/apt/lists/* ENV ANDROID_SDK_ROOT=/opt/android-sdk |