Cleanup & useradd -l

Fedora-37/Dockerfile

@@ -16,10 +16,25 @@
 # purpose image. It contains the toolchains for all supported architectures, and
 # all build dependencies.
 FROM registry.fedoraproject.org/fedora:37 AS build
+
+# Preinstall python + dependencies as virtual environment
+RUN dnf \
+      --assumeyes \
+      --nodocs \
+      --setopt=install_weak_deps=0 \
+      install \
+      python3 \
+      python3-virtualenv
+RUN virtualenv /opt/venv
+ENV VIRTUAL_ENV /opt/venv
+ENV PATH /opt/venv/bin:$PATH
+RUN pip install --upgrade pip \
+        -r "https://raw.githubusercontent.com/tianocore/edk2/master/pip-requirements.txt"
+
+
 ARG GCC_VERSION=12.3.1-1.fc37
 ARG GCC_VERSION_CROSS=12.2.1-2.fc37
 ARG NASM_VERSION=2.15.05-3.fc37
-ARG PYTHON_VERSION=3.11
 ARG GCC_LOONGARCH64_URL="https://github.com/loongson/build-tools/releases/download/2022.09.06/loongarch64-clfs-6.3-cross-tools-c-only.tar.xz"
 ARG CSPELL_VERSION=5.20.0
 ARG MARKDOWNLINT_VERSION=0.31.0
@@ -33,6 +48,7 @@ RUN dnf \
         acpica-tools \
         dotnet-runtime-${DOTNET_VERSION} \
         curl \
+        diffutils \
         gcc-c++-${GCC_VERSION} \
         gcc-${GCC_VERSION} \
         gcc-aarch64-linux-gnu-${GCC_VERSION_CROSS} \
@@ -47,16 +63,10 @@ RUN dnf \
         nuget \
         nasm-${NASM_VERSION} \
         https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-1.rh.x86_64.rpm \
-        python${PYTHON_VERSION} \
-        python3-distutils-extra \
-        python3-pip \
-        python3-setuptools \
         nodejs \
         npm \
         tar \
         sudo
-RUN alternatives --install /usr/bin/python python /usr/bin/python3 1
-RUN pip install pip lcov_cobertura --upgrade
 
 RUN mkdir -p /cross-tools/ && \
       curl -L "${GCC_LOONGARCH64_URL}" | \

Fedora-37/fedora37_dev_entrypoint.sh

@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -o -l -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd

Fedora-39/Dockerfile

@@ -17,6 +17,22 @@
 # purpose image. It contains the toolchains for all supported architectures, and
 # all build dependencies.
 FROM registry.fedoraproject.org/fedora:39 AS build
+
+# Preinstall python + dependencies as virtual environment
+RUN dnf \
+      --assumeyes \
+      --nodocs \
+      --setopt=install_weak_deps=0 \
+      install \
+      python3 \
+      python3-virtualenv
+RUN virtualenv /opt/venv
+ENV VIRTUAL_ENV /opt/venv
+ENV PATH /opt/venv/bin:$PATH
+RUN pip install --upgrade pip \
+        -r "https://raw.githubusercontent.com/tianocore/edk2/master/pip-requirements.txt"
+
+
 ARG CSPELL_VERSION=8.0.0
 ARG MARKDOWNLINT_VERSION=0.37.0
 ARG POWERSHELL_VERSION=7.4.0
@@ -29,6 +45,7 @@ RUN dnf \
         acpica-tools \
         dotnet-runtime-${DOTNET_VERSION} \
         curl \
+        diffutils \
         gcc-c++ \
         gcc \
         gcc-aarch64-linux-gnu \
@@ -44,16 +61,10 @@ RUN dnf \
         nuget \
         nasm \
         https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-1.rh.x86_64.rpm \
-        python3 \
-        python3-distutils-extra \
-        python3-pip \
-        python3-devel \
         nodejs \
         npm \
         tar \
         sudo
-RUN alternatives --install /usr/bin/python python /usr/bin/python3 1
-RUN pip install --upgrade pip lcov_cobertura setuptools
 
 ENV GCC5_AARCH64_PREFIX /usr/bin/aarch64-linux-gnu-
 ENV GCC5_ARM_PREFIX     /usr/bin/arm-linux-gnu-

Fedora-39/fedora39_dev_entrypoint.sh

@@ -39,7 +39,7 @@ user_gid=$(stat -c "%g" "${EDK2_DOCKER_USER_HOME}")
 groupadd "${EDK2_DOCKER_USER}" -f -o -g "${user_gid}"
 #
 # - Add the user.
-useradd "${EDK2_DOCKER_USER}" -o -u "${user_uid}" -g "${user_gid}" \
+useradd "${EDK2_DOCKER_USER}" -l -o -u "${user_uid}" -g "${user_gid}" \
   -G wheel -d "${EDK2_DOCKER_USER_HOME}" -M -s /bin/bash
 
 echo "${EDK2_DOCKER_USER}":tianocore | chpasswd