1
0

build: android: upgrade docker base img to debian 13

This should make the F-Droid build simpler.
ref https://gitlab.com/fdroid/fdroiddata/-/merge_requests/32358#note_3038803195
This commit is contained in:
SomberNight
2026-01-29 15:27:49 +00:00
parent cfe2a57f2c
commit 4d33b6cad9
3 changed files with 6 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
# based on https://github.com/kivy/python-for-android/blob/master/Dockerfile
FROM debian:bookworm@sha256:d568e251e460295a8743e9d5ef7de673c5a8f9027db11f4e666e96fb5bed708e
FROM debian:trixie@sha256:a3b5f4f0286249a124bfe9845b3aec0f88de32ff31dd8d7e1b945f9f98d116b0
ENV DEBIAN_FRONTEND=noninteractive
@@ -94,7 +94,7 @@ RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
# accept Android licenses (JDK necessary!)
RUN apt -y update -qq \
&& apt -y install -qq --no-install-recommends --allow-downgrades \
openjdk-17-jdk-headless \
openjdk-21-jdk-headless \
&& apt -y autoremove
RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
@@ -138,7 +138,6 @@ RUN apt -y update -q \
lbzip2 \
patch \
sudo \
software-properties-common \
git \
zip \
unzip \
@@ -150,9 +149,7 @@ RUN apt -y update -q \
libtool \
pkg-config \
zlib1g-dev \
libncurses5-dev \
libncursesw5-dev \
libtinfo5 \
libncurses-dev \
cmake \
libffi-dev \
libssl-dev \

View File

@@ -1,2 +1,2 @@
deb https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
deb-src https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
deb https://snapshot.debian.org/archive/debian/20260129T082333Z/ trixie main
deb-src https://snapshot.debian.org/archive/debian/20260129T082333Z/ trixie main

View File

@@ -7,7 +7,7 @@ set -e
DEBIAN_SNAPSHOT_BASE="https://snapshot.debian.org/archive/debian/"
DEBIAN_APPIMAGE_DISTRO="bullseye" # should match build-linux/appimage Dockerfile base
DEBIAN_WINE_DISTRO="bookworm" # should match build-wine Dockerfile base
DEBIAN_ANDROID_DISTRO="bookworm" # should match android Dockerfile base
DEBIAN_ANDROID_DISTRO="trixie" # should match android Dockerfile base
contrib="$(dirname "$0")"