Merge branch 'main' into bump_v8

pavelsavara · web-flow · commit aa7af114c90a · 2026-06-18T10:53:03.000+02:00
diff --git a/eng/docker-tools/templates/stages/build-and-test.yml b/eng/docker-tools/templates/stages/build-and-test.yml
@@ -54,7 +54,7 @@ parameters:
 ################################################################################
 stages:
 - stage: Build
-  condition: and(succeeded(), contains(variables['stages'], 'build'))
+  condition: and(succeededOrFailed(), contains(variables['stages'], 'build'))
   dependsOn: []
   jobs:
 
diff --git a/src/almalinux/10/helix/amd64/Dockerfile b/src/almalinux/10/helix/amd64/Dockerfile
@@ -14,7 +14,7 @@ RUN dnf upgrade --refresh -y \
 
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/almalinux/8/helix/amd64/Dockerfile b/src/almalinux/8/helix/amd64/Dockerfile
@@ -39,7 +39,7 @@ ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv $VIRTUAL_ENV && \
     ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/almalinux/9/helix/amd64/Dockerfile b/src/almalinux/9/helix/amd64/Dockerfile
@@ -15,7 +15,7 @@ RUN dnf upgrade --refresh -y \
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
     && pip install --upgrade pip setuptools \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/alpine/3.23/helix/Dockerfile b/src/alpine/3.23/helix/Dockerfile
@@ -15,7 +15,7 @@ RUN apk add --upgrade --no-cache \
 
 RUN python3 -m venv /venv && \
         source /venv/bin/activate && \
-        pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+        pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
         pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/alpine/3.24/helix/Dockerfile b/src/alpine/3.24/helix/Dockerfile
@@ -15,7 +15,7 @@ RUN apk add --upgrade --no-cache \
 
 RUN python3 -m venv /venv && \
         source /venv/bin/activate && \
-        pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+        pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
         pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/alpine/edge/helix/Dockerfile b/src/alpine/edge/helix/Dockerfile
@@ -15,7 +15,7 @@ RUN apk add --upgrade --no-cache \
 
 RUN python3 -m venv /venv && \
         source /venv/bin/activate && \
-        pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+        pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
         pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/azurelinux/3.0/helix/Dockerfile b/src/azurelinux/3.0/helix/Dockerfile
@@ -15,7 +15,7 @@ RUN tdnf install --refresh -y \
 
 RUN python3 -m venv /venv && \
         source /venv/bin/activate && \
-        pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+        pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
         pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/azurelinux/4.0/helix/Dockerfile b/src/azurelinux/4.0/helix/Dockerfile
@@ -13,7 +13,7 @@ RUN dnf install --refresh -y \
 
 RUN python3 -m venv /venv && \
         source /venv/bin/activate && \
-        pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+        pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
         pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
         rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/centos-stream/10/helix/Dockerfile b/src/centos-stream/10/helix/Dockerfile
@@ -14,7 +14,7 @@ RUN dnf upgrade --refresh -y \
 
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/centos-stream/9/helix/amd64/Dockerfile b/src/centos-stream/9/helix/amd64/Dockerfile
@@ -56,7 +56,7 @@ ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv $VIRTUAL_ENV && \
     ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/centos-stream/9/mlnet/helix/amd64/Dockerfile b/src/centos-stream/9/mlnet/helix/amd64/Dockerfile
@@ -101,7 +101,7 @@ ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv $VIRTUAL_ENV && \
     ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/debian/12/helix/amd64/Dockerfile b/src/debian/12/helix/amd64/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update \
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
     && pip install --upgrade pip setuptools \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/debian/12/helix/arm32v7/Dockerfile b/src/debian/12/helix/arm32v7/Dockerfile
@@ -25,7 +25,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
     && pip install --upgrade pip setuptools \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/debian/12/helix/arm64v8/Dockerfile b/src/debian/12/helix/arm64v8/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update \
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
     && pip install --upgrade pip setuptools \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/debian/13/helix/Dockerfile b/src/debian/13/helix/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
 
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/fedora/42/helix/amd64/Dockerfile b/src/fedora/42/helix/amd64/Dockerfile
@@ -18,7 +18,7 @@ RUN dnf upgrade --refresh -y \
 
 RUN python3 -m venv /venv \
     && source /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/fedora/43/helix/amd64/Dockerfile b/src/fedora/43/helix/amd64/Dockerfile
@@ -18,7 +18,7 @@ RUN dnf upgrade --refresh -y \
 
 RUN python3 -m venv /venv \
     && source /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/fedora/44/helix/amd64/Dockerfile b/src/fedora/44/helix/amd64/Dockerfile
@@ -18,7 +18,7 @@ RUN dnf upgrade --refresh -y \
 
 RUN python3 -m venv /venv \
     && source /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/fedora/45/amd64/Dockerfile b/src/fedora/45/amd64/Dockerfile
@@ -18,9 +18,10 @@ RUN dnf upgrade --refresh -y \
         ninja-build \
         pigz \
         python \
+        # Python 3.14 hosts azure-cli (installed via pip below)
+        python3.14 \
         which \
         # Tools used by build automation
-        azure-cli \
         git \
         jq \
         tar \
@@ -53,6 +54,16 @@ RUN dnf upgrade --refresh -y \
         icu \
     && dnf clean all
 
+# Install azure-cli from pip into a dedicated Python 3.14 virtual environment.
+# Fedora 45's default Python is 3.15 (beta), for which the distro azure-cli RPM
+# won't resolve and azure-cli's native deps have no prebuilt wheels. Python 3.14
+# has wheels for those deps, so install azure-cli there and symlink az.
+RUN azureEnv="/usr/local/share/azure-cli-env" \
+    && python3.14 -m venv "$azureEnv" \
+    && "$azureEnv/bin/python" -m pip install --upgrade pip setuptools \
+    && "$azureEnv/bin/python" -m pip install azure-cli \
+    && ln -s "$azureEnv/bin/az" /usr/local/bin/az
+
 # Install PowerShell
 RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz -o /tmp/powershell.tar.gz \
     && mkdir -p /opt/microsoft/powershell \
diff --git a/src/fedora/45/helix/amd64/Dockerfile b/src/fedora/45/helix/amd64/Dockerfile
@@ -9,16 +9,18 @@ RUN dnf upgrade --refresh -y \
         dnf-plugins-core \
     && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \
         openssl \
-        python3-devel \
+        # Use Python 3.14 to build the venv: Fedora 45's default Python is 3.15
+        # (beta), for which helix-scripts' native deps (cffi, cryptography) have no wheels.
+        python3.14 \
         python3-pip \
         gcc \
         libatomic \
         redhat-rpm-config \
     && dnf clean all
 
-RUN python3 -m venv /venv \
+RUN python3.14 -m venv /venv \
     && source /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
@@ -42,8 +44,9 @@ RUN dnf upgrade --refresh -y \
         # Helix dependencies
         python3 \
         python3-pip \
+        # Python 3.14 hosts azure-cli (installed via pip below)
+        python3.14 \
         # Tools used by build automation
-        azure-cli \
         git \
         jq \
         tar \
@@ -66,6 +69,16 @@ ENV \
     # Needed for .NET libraries tests to pass
     LANG=en-US.UTF-8
 
+# Install azure-cli from pip into a dedicated Python 3.14 virtual environment.
+# Fedora 45's default Python is 3.15 (beta), for which the distro azure-cli RPM
+# won't resolve and azure-cli's native deps have no prebuilt wheels. Python 3.14
+# has wheels for those deps, so install azure-cli there and symlink az.
+RUN azureEnv="/usr/local/share/azure-cli-env" \
+    && python3.14 -m venv "$azureEnv" \
+    && "$azureEnv/bin/python" -m pip install --upgrade pip setuptools \
+    && "$azureEnv/bin/python" -m pip install azure-cli \
+    && ln -s "$azureEnv/bin/az" /usr/local/bin/az
+
 # create helixbot user and give rights to sudo without password
 # Fedora does not have all options as other Linux systems
 RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \
@@ -77,6 +90,6 @@ USER helixbot
 ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 # Install Helix Dependencies
-RUN python3 -m venv $VIRTUAL_ENV
+RUN python3.14 -m venv $VIRTUAL_ENV
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV
diff --git a/src/fedora/rawhide/amd64/Dockerfile b/src/fedora/rawhide/amd64/Dockerfile
@@ -18,9 +18,10 @@ RUN dnf upgrade --refresh -y \
         ninja-build \
         pigz \
         python \
+        # Python 3.14 hosts azure-cli (installed via pip below)
+        python3.14 \
         which \
         # Tools used by build automation
-        azure-cli \
         git \
         jq \
         tar \
@@ -53,6 +54,16 @@ RUN dnf upgrade --refresh -y \
         icu \
     && dnf clean all
 
+# Install azure-cli from pip into a dedicated Python 3.14 virtual environment.
+# Fedora rawhide's default Python is 3.15 (beta), for which the distro azure-cli
+# RPM won't resolve and azure-cli's native deps have no prebuilt wheels. Python
+# 3.14 has wheels for those deps, so install there and symlink az.
+RUN azureEnv="/usr/local/share/azure-cli-env" \
+    && python3.14 -m venv "$azureEnv" \
+    && "$azureEnv/bin/python" -m pip install --upgrade pip setuptools \
+    && "$azureEnv/bin/python" -m pip install azure-cli \
+    && ln -s "$azureEnv/bin/az" /usr/local/bin/az
+
 # Install PowerShell
 RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz -o /tmp/powershell.tar.gz \
     && mkdir -p /opt/microsoft/powershell \
diff --git a/src/fedora/rawhide/helix/amd64/Dockerfile b/src/fedora/rawhide/helix/amd64/Dockerfile
@@ -9,16 +9,18 @@ RUN dnf upgrade --refresh -y \
         dnf-plugins-core \
     && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \
         openssl \
-        python3-devel \
+        # Use Python 3.14 to build the venv: Fedora rawhide's default Python is
+        # 3.15 (beta), for which helix-scripts' native deps (cffi, cryptography) have no wheels.
+        python3.14 \
         python3-pip \
         gcc \
         libatomic \
         redhat-rpm-config \
     && dnf clean all
 
-RUN python3 -m venv /venv \
+RUN python3.14 -m venv /venv \
     && source /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
@@ -42,8 +44,9 @@ RUN dnf upgrade --refresh -y \
         # Helix dependencies
         python3 \
         python3-pip \
+        # Python 3.14 hosts azure-cli (installed via pip below)
+        python3.14 \
         # Tools used by build automation
-        azure-cli \
         git \
         jq \
         tar \
@@ -66,6 +69,16 @@ ENV \
     # Needed for .NET libraries tests to pass
     LANG=en-US.UTF-8
 
+# Install azure-cli from pip into a dedicated Python 3.14 virtual environment.
+# Fedora rawhide's default Python is 3.15 (beta), for which the distro azure-cli
+# RPM won't resolve and azure-cli's native deps have no prebuilt wheels. Python
+# 3.14 has wheels for those deps, so install there and symlink az.
+RUN azureEnv="/usr/local/share/azure-cli-env" \
+    && python3.14 -m venv "$azureEnv" \
+    && "$azureEnv/bin/python" -m pip install --upgrade pip setuptools \
+    && "$azureEnv/bin/python" -m pip install azure-cli \
+    && ln -s "$azureEnv/bin/az" /usr/local/bin/az
+
 # create helixbot user and give rights to sudo without password
 # Fedora does not have all options as other Linux systems
 RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \
@@ -77,6 +90,6 @@ USER helixbot
 ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 # Install Helix Dependencies
-RUN python3 -m venv $VIRTUAL_ENV
+RUN python3.14 -m venv $VIRTUAL_ENV
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV
diff --git a/src/opensuse/16.0/helix/amd64/Dockerfile b/src/opensuse/16.0/helix/amd64/Dockerfile
@@ -58,7 +58,7 @@ WORKDIR /home/helixbot
 ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv $VIRTUAL_ENV && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/ubuntu/22.04/helix/Dockerfile b/src/ubuntu/22.04/helix/Dockerfile
@@ -65,7 +65,7 @@ ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv /home/helixbot/.vsts-env && \
     ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/ubuntu/22.04/mlnet/helix/amd64/Dockerfile b/src/ubuntu/22.04/mlnet/helix/amd64/Dockerfile
@@ -24,7 +24,7 @@ ENV VIRTUAL_ENV=/home/helixbot/.vsts-env
 
 RUN python -m venv $VIRTUAL_ENV && \
     ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools && \
-    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    ${VIRTUAL_ENV}/bin/pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     ${VIRTUAL_ENV}/bin/pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
diff --git a/src/ubuntu/24.04/helix/Dockerfile b/src/ubuntu/24.04/helix/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update && \
 
 RUN python3 -m venv /venv && \
     . /venv/bin/activate && \
-    pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/ubuntu/24.04/helix/android/amd64/Dockerfile b/src/ubuntu/24.04/helix/android/amd64/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update && \
 
 RUN python3 -m venv /venv && \
     . /venv/bin/activate && \
-    pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts && \
+    pip download --no-deps --index-url $HELIX_FEED helix-scripts && \
     pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl && \
     rm ./helix_scripts-*-py3-none-any.whl
 
diff --git a/src/ubuntu/26.04/helix/Dockerfile b/src/ubuntu/26.04/helix/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update \
 
 RUN python3 -m venv /venv \
     && . /venv/bin/activate \
-    && pip download --no-deps --index-url $HELIX_FEED --extra-index-url $PIP_INDEX_URL helix-scripts \
+    && pip download --no-deps --index-url $HELIX_FEED helix-scripts \
     && pip install --index-url $PIP_INDEX_URL ./helix_scripts-*-py3-none-any.whl \
     && rm ./helix_scripts-*-py3-none-any.whl
 
