Skip to content
Snippets Groups Projects
Commit f0a5d615 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

vlc-debian-android: switch to Debian bookworm

This will provide a much newer CMake. The NDK requires CMake 3.19 to use
its toolchain file properly. Debian bullseye only has 3.18.

We need to change the groupadd/useradd as it is not part of bookworn slim.
parent 4b2452dc
No related branches found
No related tags found
No related merge requests found
FROM debian:bullseye-20230208-slim
FROM debian:bookworm-20230522-slim
MAINTAINER VideoLAN roots <roots@videolan.org>
ENV IMAGE_DATE=202211290000
ENV IMAGE_DATE=202306021100
COPY crossfiles/ /opt/crossfiles/
......@@ -20,8 +20,8 @@ ARG CORES=8
ENV PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:/sdk/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/:/opt/tools/bin:$PATH
RUN addgroup --quiet --gid ${VIDEOLAN_CI_UID} videolan && \
adduser --quiet --uid ${VIDEOLAN_CI_UID} --ingroup videolan videolan && \
RUN groupadd --gid ${VIDEOLAN_CI_UID} videolan && \
useradd --uid ${VIDEOLAN_CI_UID} --gid videolan --create-home --shell /bin/bash videolan && \
echo "videolan:videolan" | chpasswd && \
mkdir -p /usr/share/man/man1 && \
echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list && \
......@@ -30,7 +30,7 @@ RUN addgroup --quiet --gid ${VIDEOLAN_CI_UID} videolan && \
ca-certificates autoconf m4 automake ant autopoint bison \
flex build-essential libtool libtool-bin patch pkg-config ragel subversion cmake \
git yasm ragel g++ protobuf-compiler gettext ninja-build \
wget expect unzip python python3 python3-venv python3-setuptools python3-mako \
wget expect unzip python3 python3-venv python3-setuptools python3-mako \
locales libltdl-dev curl automake nasm && \
apt-get install --no-install-suggests --no-install-recommends -y \
-t buster-backports meson && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment