From fc77d8e6b1210fa9c27bf9ee6fe4b9ab51be4f5d Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Sat, 19 Nov 2022 16:44:22 -0300
Subject: [PATCH] Fix devcontainer build

---
 .github/workflows/pull_request.yml |  3 ++-
 Dockerfile                         | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b194f3ddd..f3093965b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -8,6 +8,7 @@ env:
 jobs:
   build_devcontainer:
     runs-on: ubuntu-latest
+    name: Build Devcontainer
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@master
@@ -48,7 +49,7 @@ jobs:
 
   python_checks:
     runs-on: ubuntu-latest
-    name: Python checks
+    name: Python Checks
     steps:
       - name: Check out the repository
         uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index a33f2ad25..c9844d36d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,7 @@ RUN --mount=type=bind,from=wheels,source=/wheels,target=/wheels \
     gnupg \
     wget \
     procps \
-    unzip tzdata libxml2 xz-utils \
+    unzip locales tzdata libxml2 xz-utils \
     python3-pip \
     # add raspberry pi repo
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \
@@ -94,10 +94,12 @@ RUN --mount=type=bind,from=wheels,source=/wheels,target=/wheels \
     fi \
     # arch specific packages
     && if [ "${TARGETARCH}" = "amd64" ]; then \
+    # Use debian testing repo only for hwaccel packages
     echo 'deb http://deb.debian.org/debian testing main non-free' > /etc/apt/sources.list.d/debian-testing.list \
     && apt-get -qq update \
     && apt-get -qq install --no-install-recommends --no-install-suggests -y \
-    mesa-va-drivers libva-drm2 intel-media-va-driver-non-free i965-va-driver libmfx1; \
+    mesa-va-drivers libva-drm2 intel-media-va-driver-non-free i965-va-driver libmfx1 \
+    && rm -f /etc/apt/sources.list.d/debian-testing.list; \
     fi \
     && if [ "${TARGETARCH}" = "arm64" ]; then \
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
@@ -154,14 +156,9 @@ ENTRYPOINT ["/init"]
 FROM deps AS deps-node
 
 # Install Node 16
-RUN \
-    # debian testing repo provides its own nodejs package, so we remove it first \
-    mv -f /etc/apt/sources.list.d/debian-testing.list /tmp/debian-testing.list\
-    && wget -qO- https://deb.nodesource.com/setup_16.x | bash - \
+RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash - \
     && apt-get install -y nodejs \
-    && npm install -g npm@9 \
-    # then we restore the debian testing repo \
-    && mv -f /tmp/debian-testing.list /etc/apt/sources.list.d/debian-testing.list
+    && npm install -g npm@9
 
 # Devcontainer
 FROM deps-node AS devcontainer