Update devcontainer dependencies

selkies-project · Oct 13, 2023 · 8248bdb · 8248bdb
1 parent 793806c
commit 8248bdb
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 29 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -12,8 +12,6 @@ RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -
     wmctrl \
     jq \
     gdebi-core \
-    glib-networking \
-    libopus0 \
     libgdk-pixbuf2.0-0 \
     libgtk2.0-bin \
     libgl-dev \
@@ -27,52 +25,59 @@ RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -
     xserver-xorg-core \
     wayland-protocols \
     libwayland-dev \
-    libwayland-egl-backend-dev \
+    libwayland-egl1 \
     libx11-xcb1 \
     libxkbcommon0 \
     libxdamage1 \
-    libxml2-dev \
-    libwebrtc-audio-processing1 \
+    libsoup2.4-1 \
+    libsoup-gnome2.4-1 \
     libsrtp2-1 \
-    libcairo-gobject2 \
+    lame \
+    libopus0 \
+    libwebrtc-audio-processing1 \
     pulseaudio \
     libpulse0 \
+    libcairo-gobject2 \
     libpangocairo-1.0-0 \
-    libgirepository1.0-dev \
+    libgirepository-1.0-1 \
+    libopenjp2-7 \
     libjpeg-dev \
     libwebp-dev \
     libvpx-dev \
     zlib1g-dev \
-    x264 \
-    xvfb \
-    coturn
+    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
 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 -
 
-# Install dev dependencies
-RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
+# Install development dependencies
+RUN sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        xvfb \
+        coturn \
         nginx \
         imagemagick \
         python3-venv && \
+    sudo rm -rf /var/lib/apt/lists/* && \
     sudo python3 -m pip install --upgrade build
 
 # Install desktop environment
 ARG DESKTOP=xfce
 COPY ./features/desktop-selkies/src/install-desktop-environment.sh /tmp/
 RUN /tmp/install-desktop-environment.sh ${DESKTOP}
 
-# Install browser
-RUN cd /tmp && sudo apt-get update && \
-    wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
-    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y xdg-utils ./google-chrome-stable_current_amd64.deb && \
-    sudo rm -f google-chrome-stable_current_amd64.deb && \
+# Install Chrome browser
+RUN cd /tmp && curl -fsSL -o ./google-chrome-stable.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
+    sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y xdg-utils ./google-chrome-stable.deb && \
+    sudo rm -rf /var/lib/apt/lists/* && \
+    sudo rm -f google-chrome-stable.deb && \
     xdg-settings set default-web-browser google-chrome.desktop
 
-# Install other dev utils
+# Install other development utilities
 RUN sudo apt-get update && sudo apt-get install -y \
     jstest-gtk \
-    netcat
+    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
@@ -7,7 +7,7 @@ echo "The provided web port is: ${WEB_PORT:-missing env}"
 echo "The provided xserver is: ${XSERVER:-missing env}"
 
 # Install base dependencies
-apt-get update && apt-get install --no-install-recommends -y \
+apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     python3-pip \
     python3-dev \
     python3-gi \
@@ -17,8 +17,6 @@ apt-get update && apt-get install --no-install-recommends -y \
     wmctrl \
     jq \
     gdebi-core \
-    glib-networking \
-    libopus0 \
     libgdk-pixbuf2.0-0 \
     libgtk2.0-bin \
     libgl-dev \
@@ -32,25 +30,34 @@ apt-get update && apt-get install --no-install-recommends -y \
     xserver-xorg-core \
     wayland-protocols \
     libwayland-dev \
-    libwayland-egl-backend-dev \
+    libwayland-egl1 \
     libx11-xcb1 \
     libxkbcommon0 \
     libxdamage1 \
-    libxml2-dev \
-    libwebrtc-audio-processing1 \
+    libsoup2.4-1 \
+    libsoup-gnome2.4-1 \
     libsrtp2-1 \
-    libcairo-gobject2 \
+    lame \
+    libopus0 \
+    libwebrtc-audio-processing1 \
     pulseaudio \
     libpulse0 \
+    libcairo-gobject2 \
     libpangocairo-1.0-0 \
-    libgirepository1.0-dev \
+    libgirepository-1.0-1 \
+    libopenjp2-7 \
     libjpeg-dev \
     libwebp-dev \
     libvpx-dev \
     zlib1g-dev \
-    x264 \
+    x264 && \
+rm -rf /var/lib/apt/lists/*
+
+# Install development dependencies
+apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     xvfb \
-    coturn
+    coturn && \
+rm -rf /var/lib/apt/lists/*
 
 . /etc/lsb-release
 if [ "${DISTRIB_RELEASE}" \> "20.04" ]; then apt-get install --no-install-recommends -y xcvt; fi