VNC-127 Replace individual script runs with unified build-deps.sh

builder/dockerfile.alpine_318.build

@@ -43,7 +43,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libtbb-dev \
     mesa-dev \
     mesa-dri-gallium \
     meson \
@@ -74,8 +73,7 @@ RUN \
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.alpine_319.build

@@ -43,7 +43,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libtbb-dev \
     mesa-dev \
     mesa-dri-gallium \
     meson \
@@ -74,8 +73,7 @@ RUN \
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.alpine_320.build

@@ -43,7 +43,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libtbb-dev \
     mesa-dev \
     mesa-dri-gallium \
     meson \
@@ -74,8 +73,7 @@ RUN \
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.alpine_321.build

@@ -43,7 +43,6 @@ RUN \
     libxrandr-dev \
     libxshmfence-dev \
     libxtst-dev \
-    libtbb-dev \
     mesa-dev \
     mesa-dri-gallium \
     meson \
@@ -74,8 +73,7 @@ RUN \
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.debian_bookworm.build

@@ -24,12 +24,11 @@ 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 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 libavformat-dev libswscale-dev libtbb-dev
+    libxcursor-dev libavformat-dev libswscale-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

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 libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/dockerfile.debian_bullseye.build

@@ -14,7 +14,7 @@ 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 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 libavformat-dev libswscale-dev libtbb-dev
+    libxcursor-dev libavformat-dev libswscale-dev
 
 RUN CMAKE_URL="https://cmake.org/files/v3.22/cmake-3.22.0" && \
     ARCH=$(arch) && \
@@ -31,8 +31,7 @@ RUN CMAKE_URL="https://cmake.org/files/v3.22/cmake-3.22.0" && \
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

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 libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/dockerfile.debian_buster.build

@@ -13,12 +13,11 @@ 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 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 libtbb-dev
+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
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

builder/dockerfile.fedora_forty.build

@@ -74,13 +74,11 @@ RUN \
     xorg-x11-xtrans-devel \
     xsltproc \
     libavformat-free-devel \
-    libswscale-free-devel \
-    tbb-devel
+    libswscale-free-devel
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.fedora_fortyone.build

@@ -75,13 +75,11 @@ RUN \
     xorg-x11-xtrans-devel \
     xsltproc \
     libavformat-free-devel \
-    libswscale-free-devel \
-    tbb-devel
+    libswscale-free-devel
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.fedora_thirtynine.build

@@ -74,13 +74,11 @@ RUN \
     xorg-x11-xtrans-devel \
     xsltproc \
     libavformat-free-devel \
-    libswscale-free-devel \
-    tbb-devel
+    libswscale-free-devel
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd
 

builder/dockerfile.kali_kali-rolling.build

@@ -15,12 +15,11 @@ 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 libavformat-dev libswscale-dev libtbb-dev
+    libxcursor-dev libavformat-dev libswscale-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

builder/dockerfile.kali_kali-rolling.deb.build

@@ -3,7 +3,7 @@ FROM kalilinux/kali-rolling:latest
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-      apt-get -y install vim build-essential devscripts equivs libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/dockerfile.opensuse_15.build

@@ -46,8 +46,7 @@ RUN zypper install -ny \
   xorg-x11-devel \
   xorg-x11-server-sdk \
   xorg-x11-util-devel \
-  zlib-devel \
-  tbb-devel
+  zlib-devel
 
 RUN useradd -u 1000 docker && \
   groupadd -g 1000 docker && \
@@ -71,7 +70,7 @@ ENV CC=/usr/bin/gcc-14
 ENV CXX=/usr/bin/g++-14
 
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-libjpeg-turbo && $SCRIPTS_DIR/build-webp
+RUN $SCRIPTS_DIR/build-deps.sh
 
 COPY --chown=docker:docker . /src/
 

builder/dockerfile.oracle_8.build

@@ -32,8 +32,7 @@ RUN \
     tigervnc-server \
     wget \
     xorg-x11-font-utils \
-    zlib-devel \
-    tbb-devel
+    zlib-devel
 
 # Enable additional repos (epel, powertools, and fusion)
 RUN dnf config-manager --set-enabled ol8_codeready_builder
@@ -42,7 +41,6 @@ RUN dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-
 
 # Install from new repos
 RUN dnf install -y \
-  tbb-devel \
   ffmpeg-devel \
   giflib-devel \
   lbzip2 \
@@ -59,8 +57,8 @@ RUN dnf install -y \
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
 RUN echo "source /opt/rh/gcc-toolset-14/enable" > /etc/profile.d/gcc-toolset.sh && \
-  $SCRIPTS_DIR/build-webp && $SCRIPTS_DIR/build-libjpeg-turbo && \
-  useradd -m docker && echo "docker:docker" | chpasswd
+    $SCRIPTS_DIR/build-deps.sh  && \
+    useradd -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/
 

builder/dockerfile.oracle_9.build

@@ -34,8 +34,7 @@ RUN \
     tigervnc-server \
     wget \
     xorg-x11-font-utils \
-    zlib-devel \
-    tbb-devel
+    zlib-devel
 
 # Enable additional repos (epel, powertools, and fusion)
 RUN dnf install -y oracle-epel-release-el9
@@ -58,7 +57,7 @@ RUN dnf install -y \
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
 RUN echo "source /opt/rh/gcc-toolset-14/enable" > /etc/profile.d/gcc-toolset.sh && \
-  $SCRIPTS_DIR/build-webp && $SCRIPTS_DIR/build-libjpeg-turbo && \
+  $SCRIPTS_DIR/build-deps.sh && \
   useradd -m docker && echo "docker:docker" | chpasswd
 
 COPY --chown=docker:docker . /src/

builder/dockerfile.ubuntu_focal.build

@@ -13,7 +13,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 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 \
+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
@@ -34,8 +34,7 @@ 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
+RUN $SCRIPTS_DIR/build-deps.sh
 
 COPY --chown=docker:docker . /src/
 

builder/dockerfile.ubuntu_focal.deb.build

@@ -3,7 +3,7 @@ FROM ubuntu:focal
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-      apt-get -y install vim build-essential devscripts equivs libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/dockerfile.ubuntu_jammy.build

@@ -14,12 +14,11 @@ 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 libavformat-dev libswscale-dev libtbb-dev
+    libxcursor-dev libavformat-dev libswscale-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

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 libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/dockerfile.ubuntu_jammy.dev

@@ -53,18 +53,16 @@ RUN sed -i 's$# deb-src$deb-src$' /etc/apt/sources.list && \
     libxkbfile-dev \
     x11proto-dev \
     libgbm-dev \
+    htop \
     inotify-tools && \
     echo "kasm-user  ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 RUN curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
 RUN apt install -y nodejs nginx
 
-COPY builder/scripts/build-webp /tmp
-COPY builder/scripts/build-libjpeg-turbo /tmp
-COPY builder/common.sh /tmp
-
-RUN chmod +x /tmp/build-webp && /tmp/build-webp
-RUN chmod +x /tmp/build-libjpeg-turbo && /tmp/build-libjpeg-turbo
+ENV SCRIPTS_DIR=/tmp/scripts
+COPY builder/scripts $SCRIPTS_DIR
+RUN $SCRIPTS_DIR/build-deps.sh
 
 USER 1000
 

builder/dockerfile.ubuntu_noble.build

@@ -14,12 +14,11 @@ 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 libavformat-dev libswscale-dev libtbb-dev
+    libxcursor-dev libavformat-dev libswscale-dev
 
 ENV SCRIPTS_DIR=/tmp/scripts
 COPY builder/scripts $SCRIPTS_DIR
-RUN $SCRIPTS_DIR/build-webp
-RUN $SCRIPTS_DIR/build-libjpeg-turbo
+RUN $SCRIPTS_DIR/build-deps.sh
 
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 

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 libtbb-dev
+      apt-get -y install vim build-essential devscripts equivs
 
 # Install build-deps for the package.
 COPY ./debian/control /tmp

builder/scripts/build-deps.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+source_dir=$(dirname "$0")
+"${source_dir}"/build-libjpeg-turbo
+"${source_dir}"/build-webp
+"${source_dir}"/build-tbb

builder/scripts/build-tbb

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+build_and_install() {
+  cmake -B build -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DTBB_TEST=OFF -GNinja .
+  ninja -C build install
+}
+
+prepare_source() {
+  DIR=tbb
+  cd /tmp
+  TBB_RELEASE=$(curl -sL "https://api.github.com/repos/uxlfoundation/oneTBB/releases/latest" \
+    | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+
+  [ -d ./${DIR} ] && rm -rf ./${DIR}
+  mkdir ${DIR}
+  curl -Ls "https://github.com/uxlfoundation/oneTBB/archive/${TBB_RELEASE}.tar.gz" | \
+  tar xzvf - -C ${DIR}/ --strip-components=1
+  cd ${DIR}
+}
+
+prepare_source
+build_and_install