Skip to content
Snippets Groups Projects
Commit 47aa9518 authored by Steve Lhomme's avatar Steve Lhomme Committed by Marvin Scholz
Browse files

vlc-debian-android-3.0: clean used packages

* subversion is not needed anymore
* ragel was found twice
* automake was used from testing
* protobuf-compiler is not used, we build our own since a3d8d80e
* python3 alone should be sufficient
* libwebkitgtk-1.0-0 should not be needed

Similar to 99748483 for 3.0

* subversion is not needed anymore
* ragel was found twice
* automake was used from testing
* protobuf-compiler is not used, we build our own since a3d8d80e
* python3 alone should be sufficient
* libwebkitgtk-1.0-0 should not be needed
* rpm2cpio  should not be needed
* libgsm1-dev should not be needed

Similar to 99748483 for 3.0
parent 6e8cb6bf
No related branches found
No related tags found
No related merge requests found
FROM debian:stretch-20210927 FROM debian:bookworm-20230522-slim
MAINTAINER VideoLAN roots <roots@videolan.org> MAINTAINER VideoLAN roots <roots@videolan.org>
ENV IMAGE_DATE=202110041109 ENV IMAGE_DATE=202306200801
ENV ANDROID_NDK="/sdk/android-ndk" \ ENV ANDROID_NDK="/sdk/android-ndk" \
ANDROID_SDK="/sdk/android-sdk-linux" ANDROID_SDK="/sdk/android-sdk-linux"
...@@ -18,18 +18,15 @@ ARG CORES=8 ...@@ -18,18 +18,15 @@ ARG CORES=8
ENV PATH=/opt/tools/bin:$PATH ENV PATH=/opt/tools/bin:$PATH
RUN addgroup --quiet --gid ${VIDEOLAN_CI_UID} videolan && \ RUN groupadd --gid ${VIDEOLAN_CI_UID} videolan && \
adduser --quiet --uid ${VIDEOLAN_CI_UID} --ingroup videolan videolan && \ useradd --uid ${VIDEOLAN_CI_UID} --gid videolan --create-home --shell /bin/bash videolan && \
echo "videolan:videolan" | chpasswd && \ echo "videolan:videolan" | chpasswd && \
apt-get update && \ apt-get update && \
apt-get install --no-install-suggests --no-install-recommends -y \ apt-get install --no-install-suggests --no-install-recommends -y \
openjdk-8-jdk-headless ca-certificates autoconf m4 automake ant autopoint bison \ openjdk-8-jdk-headless ca-certificates autoconf m4 automake ant autopoint bison \
flex build-essential libtool libtool-bin patch pkg-config ragel subversion \ flex build-essential libtool libtool-bin patch pkg-config \
git rpm2cpio libwebkitgtk-1.0-0 yasm ragel g++ protobuf-compiler gettext \ git yasm ragel g++ gettext \
libgsm1-dev wget expect unzip python python3 locales libltdl-dev curl && \ wget expect unzip python3 locales libltdl-dev curl && \
echo "deb http://deb.debian.org/debian testing main" > /etc/apt/sources.list.d/testing.list && \
apt-get update && apt-get -y -t testing --no-install-suggests --no-install-recommends install automake && \
rm -f /etc/apt/sources.list.d/testing.list && \
apt-get clean -y && rm -rf /var/lib/apt/lists/* && \ apt-get clean -y && rm -rf /var/lib/apt/lists/* && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \ localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
echo "export ANDROID_NDK=${ANDROID_NDK}" >> /etc/profile.d/vlc_env.sh && \ echo "export ANDROID_NDK=${ANDROID_NDK}" >> /etc/profile.d/vlc_env.sh && \
......
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