KASM-7194 Add NASM to all builder Dockerfiles

builder/dockerfile.alpine_318.build

@@ -14,6 +14,7 @@ RUN \
     bash \
     ca-certificates \
     cmake \
+    nasm \
     coreutils \
     curl \
     eudev-dev \

builder/dockerfile.alpine_319.build

@@ -14,6 +14,7 @@ RUN \
     bash \
     ca-certificates \
     cmake \
+    nasm \
     coreutils \
     curl \
     eudev-dev \

builder/dockerfile.alpine_320.build

@@ -14,6 +14,7 @@ RUN \
     bash \
     ca-certificates \
     cmake \
+    nasm \
     coreutils \
     curl \
     eudev-dev \

builder/dockerfile.alpine_321.build

@@ -14,6 +14,7 @@ RUN \
     bash \
     ca-certificates \
     cmake \
+    nasm \
     coreutils \
     curl \
     eudev-dev \

builder/dockerfile.debian_bookworm.build

@@ -22,7 +22,7 @@ RUN apt-get update && \
 
 RUN DEBIAN_FRONTEND=noninteractive 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 cmake git libgnutls28-dev vim wget tightvncserver curl
+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
 
 ENV SCRIPTS_DIR=/tmp/scripts

builder/dockerfile.debian_bullseye.build

@@ -12,7 +12,7 @@ RUN apt-get update && \
 
 RUN DEBIAN_FRONTEND=noninteractive 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 git libgnutls28-dev vim wget tightvncserver curl
+RUN apt-get update && apt-get -y install ninja-build 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 CMAKE_URL="https://cmake.org/files/v3.22/cmake-3.22.0" && \

builder/dockerfile.debian_buster.build

@@ -12,7 +12,7 @@ RUN apt-get update && \
 
 RUN DEBIAN_FRONTEND=noninteractive 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 cmake git libgnutls28-dev vim wget tightvncserver curl
+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
 
 ENV SCRIPTS_DIR=/tmp/scripts

builder/dockerfile.fedora_forty.build

@@ -16,6 +16,7 @@ RUN \
     byacc \
     bzip2 \
     cmake \
+    nasm \
     diffutils \
     doxygen \
     file \

builder/dockerfile.fedora_fortyone.build

@@ -17,6 +17,7 @@ RUN \
     byacc \
     bzip2 \
     cmake \
+    nasm \
     diffutils \
     doxygen \
     file \

builder/dockerfile.fedora_thirtynine.build

@@ -16,6 +16,7 @@ RUN \
     byacc \
     bzip2 \
     cmake \
+    nasm \
     diffutils \
     doxygen \
     file \

builder/dockerfile.kali_kali-rolling.build

@@ -13,7 +13,7 @@ RUN apt-get update && \
 RUN DEBIAN_FRONTEND=noninteractive 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 gcc g++ curl
-RUN apt-get update && apt-get -y install cmake git libgnutls28-dev vim wget tightvncserver
+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
 
 ENV SCRIPTS_DIR=/tmp/scripts

builder/dockerfile.opensuse_15.build

@@ -9,6 +9,7 @@ RUN zypper install -ny \
   bdftopcf \
   bigreqsproto-devel \
   cmake \
+  nasm \
   curl \
   ffmpeg-4-libavcodec-devel \
   fonttosfnt \

builder/dockerfile.oracle_8.build

@@ -12,6 +12,7 @@ RUN \
     bzip2-devel \
     ca-certificates \
     cmake \
+    nasm \
     dnf-plugins-core \
     gcc \
     gcc-c++ \

builder/dockerfile.oracle_9.build

@@ -12,6 +12,7 @@ RUN \
     bzip2-devel \
     ca-certificates \
     cmake \
+    nasm \
     dnf-plugins-core \
     gcc \
     gcc-c++ \

builder/dockerfile.ubuntu_focal.build

@@ -12,13 +12,11 @@ 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 cmake git vim wget curl
+RUN apt-get update && apt-get -y install ninja-build nasm git vim wget curl
 RUN apt-get update && apt-get -y install libtbb-dev libpng-dev libtiff-dev libgif-dev libavcodec-dev libssl-dev libxrandr-dev libxcursor-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
@@ -35,6 +33,9 @@ RUN ARCH=$(arch) && \
   (echo y; echo n) | bash cmake.sh --prefix=/usr/local --skip-license && \
   rm cmake.sh
 
+RUN $SCRIPTS_DIR/build-webp
+RUN $SCRIPTS_DIR/build-libjpeg-turbo
+
 COPY --chown=docker:docker . /src/
 
 USER docker

builder/dockerfile.ubuntu_jammy.build

@@ -12,7 +12,7 @@ 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 cmake git libgnutls28-dev vim wget tightvncserver curl
+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
 
 ENV SCRIPTS_DIR=/tmp/scripts

builder/dockerfile.ubuntu_noble.build

@@ -12,7 +12,7 @@ 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 cmake git libgnutls28-dev vim wget curl
+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
 
 ENV SCRIPTS_DIR=/tmp/scripts