Format container examples

selkies-project · Oct 15, 2023 · 0a65299 · 0a65299
1 parent 8248bdb
commit 0a65299
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 55 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,54 +3,54 @@ FROM mcr.microsoft.com/devcontainers/base:${IMAGE_TAG}
 
 # Install base dependencies
 RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-    python3-pip \
-    python3-dev \
-    python3-gi \
-    python3-setuptools \
-    python3-wheel \
-    udev \
-    wmctrl \
-    jq \
-    gdebi-core \
-    libgdk-pixbuf2.0-0 \
-    libgtk2.0-bin \
-    libgl-dev \
-    libgles-dev \
-    libglvnd-dev \
-    libgudev-1.0-0 \
-    xclip \
-    x11-utils \
-    xdotool \
-    x11-xserver-utils \
-    xserver-xorg-core \
-    wayland-protocols \
-    libwayland-dev \
-    libwayland-egl1 \
-    libx11-xcb1 \
-    libxkbcommon0 \
-    libxdamage1 \
-    libsoup2.4-1 \
-    libsoup-gnome2.4-1 \
-    libsrtp2-1 \
-    lame \
-    libopus0 \
-    libwebrtc-audio-processing1 \
-    pulseaudio \
-    libpulse0 \
-    libcairo-gobject2 \
-    libpangocairo-1.0-0 \
-    libgirepository-1.0-1 \
-    libopenjp2-7 \
-    libjpeg-dev \
-    libwebp-dev \
-    libvpx-dev \
-    zlib1g-dev \
-    x264 && \
+        python3-pip \
+        python3-dev \
+        python3-gi \
+        python3-setuptools \
+        python3-wheel \
+        udev \
+        wmctrl \
+        jq \
+        gdebi-core \
+        libgdk-pixbuf2.0-0 \
+        libgtk2.0-bin \
+        libgl-dev \
+        libgles-dev \
+        libglvnd-dev \
+        libgudev-1.0-0 \
+        xclip \
+        x11-utils \
+        xdotool \
+        x11-xserver-utils \
+        xserver-xorg-core \
+        wayland-protocols \
+        libwayland-dev \
+        libwayland-egl1 \
+        libx11-xcb1 \
+        libxkbcommon0 \
+        libxdamage1 \
+        libsoup2.4-1 \
+        libsoup-gnome2.4-1 \
+        libsrtp2-1 \
+        lame \
+        libopus0 \
+        libwebrtc-audio-processing1 \
+        pulseaudio \
+        libpulse0 \
+        libcairo-gobject2 \
+        libpangocairo-1.0-0 \
+        libgirepository-1.0-1 \
+        libopenjp2-7 \
+        libjpeg-dev \
+        libwebp-dev \
+        libvpx-dev \
+        zlib1g-dev \
+        x264 && \
     sudo rm -rf /var/lib/apt/lists/*
 
 RUN . /etc/lsb-release; if [ "${DISTRIB_RELEASE}" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; fi
 
-# Download and extract latest gstreamer component
+# Download and extract latest GStreamer component
 RUN cd /opt && . /etc/lsb-release && SELKIES_VERSION=$(curl -fsSL "https://api.github.com/repos/selkies-project/selkies-gstreamer/releases/latest" | jq -r '.tag_name' | sed 's/[^0-9\.\-]*//g') && \
     curl -fsSL "https://github.com/selkies-project/selkies-gstreamer/releases/download/v${SELKIES_VERSION}/selkies-gstreamer-v${SELKIES_VERSION}-ubuntu${DISTRIB_RELEASE}.tgz" | tar -zxf -
 
@@ -77,7 +77,7 @@ RUN cd /tmp && curl -fsSL -o ./google-chrome-stable.deb https://dl.google.com/li
     xdg-settings set default-web-browser google-chrome.desktop
 
 # Install other development utilities
-RUN sudo apt-get update && sudo apt-get install -y \
-    jstest-gtk \
-    netcat && \
+RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        jstest-gtk \
+        netcat && \
     sudo rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/features/desktop-selkies/src/install.sh b/.devcontainer/features/desktop-selkies/src/install.sh
@@ -53,7 +53,7 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-re
     x264 && \
 rm -rf /var/lib/apt/lists/*
 
-# Install development dependencies
+# Install system dependencies
 apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     xvfb \
     coturn && \

diff --git a/addons/gstreamer/Dockerfile b/addons/gstreamer/Dockerfile
@@ -6,7 +6,7 @@ ARG UBUNTU_RELEASE=22.04
 FROM ubuntu:${UBUNTU_RELEASE}
 
 # Install essential dependencies
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         curl \
         build-essential \
         ca-certificates \
@@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     rm -rf /var/lib/apt/lists/*
 
 # Install build dependencies
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         autopoint \
         autoconf \
         automake \
@@ -56,7 +56,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
     rm -rf /var/lib/apt/lists/*
 
 # Install GST-Python dependencies, Meson, and Ninja
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         python3-pip \
         python3-dev \
         python-gi-dev && \

diff --git a/addons/js-interposer/Dockerfile.ubuntu_debpkg b/addons/js-interposer/Dockerfile.ubuntu_debpkg
@@ -10,7 +10,7 @@
 ARG DISTRIB_RELEASE=22.04
 FROM ubuntu:${DISTRIB_RELEASE} as build
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
         build-essential && \
     rm -rf /var/lib/apt/lists/*
 
@@ -32,7 +32,8 @@ COPY --from=build /opt/${PKG_NAME}_${PKG_VERSION}.deb /opt/${PKG_NAME}_${PKG_VER
 
 WORKDIR /opt
 
-RUN apt-get install -y --no-install-recommends \
-    /opt/${PKG_NAME}_${PKG_VERSION}.deb
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        /opt/${PKG_NAME}_${PKG_VERSION}.deb && \
+    rm -rf /var/lib/apt/lists/*
 
-RUN stat /usr/local/lib/selkies-js-interposer/joystick_interposer.so
+RUN stat /usr/local/lib/selkies-js-interposer/joystick_interposer.so