From fd96e8ab9ce386a04e14691fe5fa4c993ee2be2b Mon Sep 17 00:00:00 2001 From: El Date: Sun, 20 Apr 2025 14:17:27 +0500 Subject: [PATCH] KASM-6984 Add depedencies to docker images --- builder/dockerfile.debian_bookworm.deb.build | 2 +- builder/dockerfile.debian_bullseye.deb.build | 2 +- builder/dockerfile.kali_kali-rolling.build | 3 ++- builder/dockerfile.opensuse_15.build | 4 +++- builder/dockerfile.ubuntu_focal.build | 4 ++-- builder/dockerfile.ubuntu_jammy.build | 3 ++- builder/dockerfile.ubuntu_jammy.deb.build | 2 +- builder/dockerfile.ubuntu_noble.build | 3 ++- builder/dockerfile.ubuntu_noble.deb.build | 2 +- 9 files changed, 15 insertions(+), 10 deletions(-) diff --git a/builder/dockerfile.debian_bookworm.deb.build b/builder/dockerfile.debian_bookworm.deb.build index 2e61fbb..7e38d57 100644 --- a/builder/dockerfile.debian_bookworm.deb.build +++ b/builder/dockerfile.debian_bookworm.deb.build @@ -3,7 +3,7 @@ FROM debian:bookworm ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ - apt-get -y install vim build-essential devscripts equivs + apt-get -y install vim build-essential devscripts equivs libavformat-dev libswscale-dev # Install build-deps for the package. COPY ./debian/control /tmp diff --git a/builder/dockerfile.debian_bullseye.deb.build b/builder/dockerfile.debian_bullseye.deb.build index 51bde4f..e8c0ae1 100644 --- a/builder/dockerfile.debian_bullseye.deb.build +++ b/builder/dockerfile.debian_bullseye.deb.build @@ -3,7 +3,7 @@ FROM debian:bullseye ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ - apt-get -y install vim build-essential devscripts equivs + apt-get -y install vim build-essential devscripts equivs libavformat-dev libswscale-dev # Install build-deps for the package. COPY ./debian/control /tmp diff --git a/builder/dockerfile.kali_kali-rolling.build b/builder/dockerfile.kali_kali-rolling.build index 43a1e3a..717e8f9 100644 --- a/builder/dockerfile.kali_kali-rolling.build +++ b/builder/dockerfile.kali_kali-rolling.build @@ -14,7 +14,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tz RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install gcc g++ curl RUN apt-get update && apt-get -y install ninja-build cmake nasm git libgnutls28-dev vim wget tightvncserver -RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev +RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ + libxcursor-dev libavformat-dev libswscale-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.opensuse_15.build b/builder/dockerfile.opensuse_15.build index 6c2cd1b..a385424 100644 --- a/builder/dockerfile.opensuse_15.build +++ b/builder/dockerfile.opensuse_15.build @@ -13,6 +13,8 @@ RUN zypper install -ny \ nasm \ curl \ ffmpeg-4-libavcodec-devel \ + ffmpeg-4-libswscale-devel \ + ffmpeg-4-libavformat-devel \ fonttosfnt \ font-util \ gcc14 \ @@ -46,12 +48,12 @@ RUN zypper install -ny \ xorg-x11-server-sdk \ xorg-x11-util-devel \ zlib-devel +#RUN zypper install -ny libavformat-devel libswscale-devel RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 \ --slave /usr/bin/g++ g++ /usr/bin/g++-14 \ --slave /usr/bin/gcov gcov /usr/bin/gcov-14 - RUN useradd -u 1000 docker && \ groupadd -g 1000 docker && \ usermod -a -G docker docker diff --git a/builder/dockerfile.ubuntu_focal.build b/builder/dockerfile.ubuntu_focal.build index 57c7373..a70c56a 100644 --- a/builder/dockerfile.ubuntu_focal.build +++ b/builder/dockerfile.ubuntu_focal.build @@ -39,5 +39,5 @@ RUN $SCRIPTS_DIR/build-libjpeg-turbo COPY --chown=docker:docker . /src/ -USER docker -ENTRYPOINT ["/src/builder/build.sh"] +#USER docker +#ENTRYPOINT ["/src/builder/build.sh"] diff --git a/builder/dockerfile.ubuntu_jammy.build b/builder/dockerfile.ubuntu_jammy.build index cc6c4ff..11eafc7 100644 --- a/builder/dockerfile.ubuntu_jammy.build +++ b/builder/dockerfile.ubuntu_jammy.build @@ -13,7 +13,8 @@ RUN apt-get update && \ RUN apt-get update && apt-get install -y --no-install-recommends tzdata RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install ninja-build cmake nasm git libgnutls28-dev vim wget tightvncserver curl -RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev +RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ + libxcursor-dev libavformat-dev libswscale-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.ubuntu_jammy.deb.build b/builder/dockerfile.ubuntu_jammy.deb.build index 31dee99..ce9d84c 100644 --- a/builder/dockerfile.ubuntu_jammy.deb.build +++ b/builder/dockerfile.ubuntu_jammy.deb.build @@ -3,7 +3,7 @@ FROM ubuntu:jammy ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ - apt-get -y install vim build-essential devscripts equivs + apt-get -y install vim build-essential devscripts equivs libavformat-dev libswscale-dev # Install build-deps for the package. COPY ./debian/control /tmp diff --git a/builder/dockerfile.ubuntu_noble.build b/builder/dockerfile.ubuntu_noble.build index a4c3a6f..dfb796c 100644 --- a/builder/dockerfile.ubuntu_noble.build +++ b/builder/dockerfile.ubuntu_noble.build @@ -13,7 +13,8 @@ RUN apt-get update && \ RUN apt-get update && apt-get install -y --no-install-recommends tzdata RUN apt-get update && apt-get -y build-dep xorg-server libxfont-dev RUN apt-get update && apt-get -y install ninja-build cmake nasm git libgnutls28-dev vim wget curl -RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev +RUN apt-get update && apt-get -y install libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev \ + libxcursor-dev libavformat-dev libswscale-dev ENV SCRIPTS_DIR=/tmp/scripts COPY builder/scripts $SCRIPTS_DIR diff --git a/builder/dockerfile.ubuntu_noble.deb.build b/builder/dockerfile.ubuntu_noble.deb.build index 6a56b24..982de54 100644 --- a/builder/dockerfile.ubuntu_noble.deb.build +++ b/builder/dockerfile.ubuntu_noble.deb.build @@ -3,7 +3,7 @@ FROM ubuntu:noble ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && \ - apt-get -y install vim build-essential devscripts equivs + apt-get -y install vim build-essential devscripts equivs libavformat-dev libswscale-dev # Install build-deps for the package. COPY ./debian/control /tmp