From fd6fc9fb53e1d5f0e1bc59cdab101e8de5b73cfb Mon Sep 17 00:00:00 2001 From: wfurt Date: Thu, 30 Apr 2026 23:10:18 +0000 Subject: [PATCH 1/2] remove Helix scripts from docker images --- src/almalinux/10/helix/amd64/Dockerfile | 21 ------------ src/almalinux/8/helix/amd64/Dockerfile | 8 ----- src/almalinux/9/helix/amd64/Dockerfile | 25 -------------- src/alpine/3.23/helix/Dockerfile | 21 ------------ src/alpine/edge/helix/Dockerfile | 23 ------------- src/azurelinux/3.0/helix/Dockerfile | 21 ------------ src/cbl-mariner/2.0/helix/amd64/Dockerfile | 9 ----- src/centos-stream/10/helix/Dockerfile | 20 ----------- src/centos-stream/9/helix/amd64/Dockerfile | 9 +---- .../9/mlnet/helix/amd64/Dockerfile | 7 ---- src/debian/12/helix/amd64/Dockerfile | 25 -------------- src/debian/12/helix/arm32v7/Dockerfile | 34 ------------------- src/debian/12/helix/arm64v8/Dockerfile | 25 -------------- src/debian/13/helix/Dockerfile | 24 ------------- src/fedora/42/helix/amd64/Dockerfile | 24 ------------- src/fedora/43/helix/amd64/Dockerfile | 24 ------------- src/fedora/44/helix/amd64/Dockerfile | 24 ------------- src/fedora/45/helix/amd64/Dockerfile | 24 ------------- src/fedora/rawhide/helix/amd64/Dockerfile | 24 ------------- src/opensuse/16.0/helix/amd64/Dockerfile | 6 ---- src/ubuntu/22.04/helix/Dockerfile | 7 ---- src/ubuntu/22.04/mlnet/helix/amd64/Dockerfile | 7 ---- src/ubuntu/24.04/helix/Dockerfile | 25 -------------- .../24.04/helix/android/amd64/Dockerfile | 21 ------------ src/ubuntu/26.04/helix/Dockerfile | 25 -------------- 25 files changed, 1 insertion(+), 482 deletions(-) diff --git a/src/almalinux/10/helix/amd64/Dockerfile b/src/almalinux/10/helix/amd64/Dockerfile index caa1e27e1..516ebc0ef 100644 --- a/src/almalinux/10/helix/amd64/Dockerfile +++ b/src/almalinux/10/helix/amd64/Dockerfile @@ -1,20 +1,3 @@ -FROM library/almalinux:10 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - gcc \ - gcc-c++ \ - python3.12 \ - python3.12-devel \ - python3.12-pip - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - - FROM library/almalinux:10 # Install dependencies @@ -37,9 +20,5 @@ RUN adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/almalinux/8/helix/amd64/Dockerfile b/src/almalinux/8/helix/amd64/Dockerfile index ea26d4179..324aa537c 100644 --- a/src/almalinux/8/helix/amd64/Dockerfile +++ b/src/almalinux/8/helix/amd64/Dockerfile @@ -7,7 +7,6 @@ RUN dnf upgrade --refresh -y \ && dnf install --setopt tsflags=nodocs -y \ # Get recent python3 This is needed to get a pip recent enough # not to fail the build when installing cryptography library as - # a dependency of the helix scripts. python39 \ # Required for asp.net core test runs sudo \ @@ -31,11 +30,4 @@ RUN adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index aab15519a..638cd3bda 100644 --- a/src/almalinux/9/helix/amd64/Dockerfile +++ b/src/almalinux/9/helix/amd64/Dockerfile @@ -1,21 +1,3 @@ -FROM library/almalinux:9 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - gcc \ - gcc-c++ \ - python3.12 \ - python3.12-devel \ - python3.12-pip - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip install --upgrade pip setuptools \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - - FROM library/almalinux:9 # Install dependencies @@ -40,10 +22,3 @@ RUN adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env - -# Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV \ - && ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/alpine/3.23/helix/Dockerfile b/src/alpine/3.23/helix/Dockerfile index dfc1138f7..6c77a188e 100644 --- a/src/alpine/3.23/helix/Dockerfile +++ b/src/alpine/3.23/helix/Dockerfile @@ -1,20 +1,3 @@ -FROM library/alpine:3.23 AS venv - -RUN apk add --upgrade --no-cache \ - cargo \ - python3-dev \ - build-base \ - libffi-dev \ - openssl-dev \ - gcc \ - linux-headers - -RUN python3 -m venv /venv && \ - source /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM library/alpine:3.23 # Install .NET and test dependencies @@ -47,7 +30,3 @@ RUN /usr/sbin/adduser -D -g '' -G adm -s /bin/bash -u 1000 helixbot && \ USER helixbot # Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/alpine/edge/helix/Dockerfile b/src/alpine/edge/helix/Dockerfile index f133659f3..8ff27199c 100644 --- a/src/alpine/edge/helix/Dockerfile +++ b/src/alpine/edge/helix/Dockerfile @@ -1,20 +1,3 @@ -FROM library/alpine:edge AS venv - -RUN apk add --upgrade --no-cache \ - cargo \ - python3-dev \ - build-base \ - libffi-dev \ - openssl-dev \ - gcc \ - linux-headers - -RUN python3 -m venv /venv && \ - source /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM library/alpine:edge # Install .NET and test dependencies @@ -45,9 +28,3 @@ RUN /usr/sbin/adduser -D -g '' -G adm -s /bin/bash -u 1000 helixbot && \ echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot - -# Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/azurelinux/3.0/helix/Dockerfile b/src/azurelinux/3.0/helix/Dockerfile index 36943c144..21bc0bca8 100644 --- a/src/azurelinux/3.0/helix/Dockerfile +++ b/src/azurelinux/3.0/helix/Dockerfile @@ -1,20 +1,3 @@ -FROM mcr.microsoft.com/azurelinux/base/core:3.0 as venv - -RUN tdnf install --refresh -y \ - build-essential \ - ca-certificates-microsoft \ - gcc \ - iputils \ - python3 \ - python3-devel \ - python3-pip - -RUN python3 -m venv /venv && \ - source /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM mcr.microsoft.com/azurelinux/base/core:3.0 # Install .NET and test dependencies @@ -44,7 +27,3 @@ RUN /usr/sbin/useradd -c '' --uid 1000 --shell /bin/bash --groups adm helixbot & USER helixbot # Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/cbl-mariner/2.0/helix/amd64/Dockerfile b/src/cbl-mariner/2.0/helix/amd64/Dockerfile index ef8ac3c0b..8ff225a4d 100644 --- a/src/cbl-mariner/2.0/helix/amd64/Dockerfile +++ b/src/cbl-mariner/2.0/helix/amd64/Dockerfile @@ -29,12 +29,3 @@ RUN /usr/sbin/useradd -c '' --uid 1000 --shell /bin/bash --groups adm helixbot & USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install --upgrade pip && \ - ${VIRTUAL_ENV}/bin/pip install ./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/10/helix/Dockerfile b/src/centos-stream/10/helix/Dockerfile index 4c3e42f94..53e54681a 100644 --- a/src/centos-stream/10/helix/Dockerfile +++ b/src/centos-stream/10/helix/Dockerfile @@ -1,19 +1,3 @@ -FROM quay.io/centos/centos:stream10 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - gcc \ - gcc-c++ \ - python3 \ - python3-devel \ - python3-pip - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM quay.io/centos/centos:stream10 # Install dependencies @@ -54,9 +38,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/centos-stream/9/helix/amd64/Dockerfile b/src/centos-stream/9/helix/amd64/Dockerfile index 04d81f0cf..614b20333 100644 --- a/src/centos-stream/9/helix/amd64/Dockerfile +++ b/src/centos-stream/9/helix/amd64/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/centos/centos:stream9 # Install dependencies RUN dnf upgrade --refresh -y \ - # Required to install libunwind from the EPEL repo + # Required to install libunwind from the EPEL repo && dnf install -y epel-release \ && dnf install --setopt tsflags=nodocs -y \ dnf-plugins-core \ @@ -48,11 +48,4 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index b9de5d30f..bc5073c9e 100644 --- a/src/centos-stream/9/mlnet/helix/amd64/Dockerfile +++ b/src/centos-stream/9/mlnet/helix/amd64/Dockerfile @@ -93,11 +93,4 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --gid adm helixbot \ USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index 17609badb..a58ee9de9 100644 --- a/src/debian/12/helix/amd64/Dockerfile +++ b/src/debian/12/helix/amd64/Dockerfile @@ -1,21 +1,3 @@ -FROM library/debian:bookworm AS venv - -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y \ - coreutils \ - python3-dev \ - python3-pip \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip install --upgrade pip setuptools \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/debian:bookworm # Install Helix Dependencies @@ -66,10 +48,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot - -# Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV \ - && ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/debian/12/helix/arm32v7/Dockerfile b/src/debian/12/helix/arm32v7/Dockerfile index 504341988..ba6ce6b62 100644 --- a/src/debian/12/helix/arm32v7/Dockerfile +++ b/src/debian/12/helix/arm32v7/Dockerfile @@ -1,30 +1,3 @@ -FROM library/debian:bookworm AS venv - -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y \ - curl \ - pkg-config \ - coreutils \ - python3-dev \ - python3-pip \ - python3-venv \ - libffi-dev \ - libssl-dev \ - && rm -rf /var/lib/apt/lists/* - -# Install latest version of rust because the package version provided by Debian is too old. -# Need 1.65.0+ to install the Helix scripts due to cryptography-openssl dependency. -RUN curl -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip install --upgrade pip setuptools \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/debian:bookworm RUN apt-get update \ @@ -75,10 +48,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot - -# Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV \ - && ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/debian/12/helix/arm64v8/Dockerfile b/src/debian/12/helix/arm64v8/Dockerfile index b54641004..590359db8 100644 --- a/src/debian/12/helix/arm64v8/Dockerfile +++ b/src/debian/12/helix/arm64v8/Dockerfile @@ -1,21 +1,3 @@ -FROM library/debian:bookworm AS venv - -RUN apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y \ - coreutils \ - python3-dev \ - python3-pip \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip install --upgrade pip setuptools \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/debian:bookworm # Install Helix Dependencies @@ -65,10 +47,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas && echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/helixbot USER helixbot - -# Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV \ - && ${VIRTUAL_ENV}/bin/pip install --upgrade pip setuptools -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/debian/13/helix/Dockerfile b/src/debian/13/helix/Dockerfile index 6f762b685..003752f53 100644 --- a/src/debian/13/helix/Dockerfile +++ b/src/debian/13/helix/Dockerfile @@ -1,23 +1,3 @@ -FROM library/debian:trixie AS venv - -RUN apt-get update \ - && apt-get install -y \ - cargo \ - coreutils \ - libffi-dev \ - libssl-dev \ - pkg-config \ - python3-dev \ - python3-pip \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/debian:trixie ARG TARGETARCH @@ -75,7 +55,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot # Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/fedora/42/helix/amd64/Dockerfile b/src/fedora/42/helix/amd64/Dockerfile index d972f4dd6..15e620854 100644 --- a/src/fedora/42/helix/amd64/Dockerfile +++ b/src/fedora/42/helix/amd64/Dockerfile @@ -1,23 +1,3 @@ -FROM library/fedora:42 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - dnf-plugins-core \ - && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \ - openssl \ - python3-devel \ - python3-pip \ - gcc \ - libatomic \ - redhat-rpm-config \ - && dnf clean all - -RUN python3 -m venv /venv \ - && source /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/fedora:42 # Install Dependencies @@ -65,9 +45,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \ && chmod +s /usr/bin/ping USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/fedora/43/helix/amd64/Dockerfile b/src/fedora/43/helix/amd64/Dockerfile index e2d1b1b0f..b3fd88f7e 100644 --- a/src/fedora/43/helix/amd64/Dockerfile +++ b/src/fedora/43/helix/amd64/Dockerfile @@ -1,23 +1,3 @@ -FROM library/fedora:43 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - dnf-plugins-core \ - && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \ - openssl \ - python3-devel \ - python3-pip \ - gcc \ - libatomic \ - redhat-rpm-config \ - && dnf clean all - -RUN python3 -m venv /venv \ - && source /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/fedora:43 # Install MSQuic @@ -67,9 +47,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \ && chmod +s /usr/bin/ping USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/fedora/44/helix/amd64/Dockerfile b/src/fedora/44/helix/amd64/Dockerfile index 06b2afb3d..e9b6ea6d3 100644 --- a/src/fedora/44/helix/amd64/Dockerfile +++ b/src/fedora/44/helix/amd64/Dockerfile @@ -1,23 +1,3 @@ -FROM library/fedora:44 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - dnf-plugins-core \ - && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \ - openssl \ - python3-devel \ - python3-pip \ - gcc \ - libatomic \ - redhat-rpm-config \ - && dnf clean all - -RUN python3 -m venv /venv \ - && source /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/fedora:44 # Install MSQuic. Fedora 44 does not have it in the repositories, so use the Fedora 43 package @@ -67,9 +47,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \ && chmod +s /usr/bin/ping USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/fedora/45/helix/amd64/Dockerfile b/src/fedora/45/helix/amd64/Dockerfile index 1a2889998..c80f8b894 100644 --- a/src/fedora/45/helix/amd64/Dockerfile +++ b/src/fedora/45/helix/amd64/Dockerfile @@ -1,23 +1,3 @@ -FROM library/fedora:45 AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - dnf-plugins-core \ - && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \ - openssl \ - python3-devel \ - python3-pip \ - gcc \ - libatomic \ - redhat-rpm-config \ - && dnf clean all - -RUN python3 -m venv /venv \ - && source /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/fedora:45 # Install MSQuic. Fedora 45 does not have it in the repositories, so use the Fedora 43 package @@ -67,9 +47,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \ && chmod +s /usr/bin/ping USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/fedora/rawhide/helix/amd64/Dockerfile b/src/fedora/rawhide/helix/amd64/Dockerfile index a1499060e..cf498fc41 100644 --- a/src/fedora/rawhide/helix/amd64/Dockerfile +++ b/src/fedora/rawhide/helix/amd64/Dockerfile @@ -1,23 +1,3 @@ -FROM library/fedora:rawhide AS venv - -RUN dnf upgrade --refresh -y \ - && dnf install --setopt tsflags=nodocs -y \ - dnf-plugins-core \ - && dnf install --setopt=install_weak_deps=False --setopt tsflags=nodocs -y \ - openssl \ - python3-devel \ - python3-pip \ - gcc \ - libatomic \ - redhat-rpm-config \ - && dnf clean all - -RUN python3 -m venv /venv \ - && source /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM library/fedora:rawhide # Install MSQuic. Fedora rawhide does not have it in the repositories, so use the Fedora 43 package @@ -67,9 +47,5 @@ RUN /usr/sbin/adduser --uid 1000 --shell /bin/bash --group adm helixbot \ && chmod +s /usr/bin/ping USER helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env # Install Helix Dependencies -RUN python3 -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 index 13d1561ec..dee285ffb 100644 --- a/src/opensuse/16.0/helix/amd64/Dockerfile +++ b/src/opensuse/16.0/helix/amd64/Dockerfile @@ -51,10 +51,4 @@ RUN /usr/sbin/useradd --uid 1000 --shell /bin/bash --system --create-home --grou USER helixbot WORKDIR /home/helixbot -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python -m venv $VIRTUAL_ENV && \ - ${VIRTUAL_ENV}/bin/pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index 15ba5757e..80c701349 100644 --- a/src/ubuntu/22.04/helix/Dockerfile +++ b/src/ubuntu/22.04/helix/Dockerfile @@ -58,11 +58,4 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index d88edfa4f..e6ff2c5e3 100644 --- a/src/ubuntu/22.04/mlnet/helix/amd64/Dockerfile +++ b/src/ubuntu/22.04/mlnet/helix/amd64/Dockerfile @@ -16,11 +16,4 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot WORKDIR /home/helixbot -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 helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - ${VIRTUAL_ENV}/bin/pip install ./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 index d81d9d297..279ebf57b 100644 --- a/src/ubuntu/24.04/helix/Dockerfile +++ b/src/ubuntu/24.04/helix/Dockerfile @@ -1,24 +1,3 @@ -FROM ubuntu.azurecr.io/ubuntu:noble AS venv -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && \ - apt-get install -y \ - cargo \ - pkg-config \ - libffi-dev \ - coreutils \ - python3-dev \ - python3-pip \ - python3-venv \ - libssl-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv && \ - . /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM ubuntu.azurecr.io/ubuntu:noble ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive @@ -84,7 +63,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot # Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV diff --git a/src/ubuntu/24.04/helix/android/amd64/Dockerfile b/src/ubuntu/24.04/helix/android/amd64/Dockerfile index b8b60583e..757e1834c 100644 --- a/src/ubuntu/24.04/helix/android/amd64/Dockerfile +++ b/src/ubuntu/24.04/helix/android/amd64/Dockerfile @@ -1,24 +1,3 @@ -FROM ubuntu.azurecr.io/ubuntu:noble AS venv -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && \ - apt-get install -y \ - cargo \ - pkg-config \ - libffi-dev \ - coreutils \ - python3-dev \ - python3-pip \ - python3-venv \ - libssl-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv && \ - . /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM ubuntu.azurecr.io/ubuntu:noble ARG TARGETARCH ENV DEBIAN_FRONTEND=noninteractive diff --git a/src/ubuntu/26.04/helix/Dockerfile b/src/ubuntu/26.04/helix/Dockerfile index ee6eb04ef..f20ce74bc 100644 --- a/src/ubuntu/26.04/helix/Dockerfile +++ b/src/ubuntu/26.04/helix/Dockerfile @@ -1,24 +1,3 @@ -FROM ubuntu.azurecr.io/ubuntu:26.04 AS venv -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update \ - && apt-get install -y \ - cargo \ - coreutils \ - libffi-dev \ - libssl-dev \ - pkg-config \ - python3-dev \ - python3-pip \ - python3-venv \ - && rm -rf /var/lib/apt/lists/* - -RUN python3 -m venv /venv \ - && . /venv/bin/activate \ - && pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple \ - && pip install ./helix_scripts-*-py3-none-any.whl \ - && rm ./helix_scripts-*-py3-none-any.whl - FROM ubuntu.azurecr.io/ubuntu:26.04 ARG TARGETARCH ARG LIBMSQUIC_VERSION=2.5.6 @@ -90,7 +69,3 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot # Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV From 334c29fd3f2093be6f6bef43372dc3c70e25f201 Mon Sep 17 00:00:00 2001 From: wfurt Date: Thu, 30 Apr 2026 23:32:55 +0000 Subject: [PATCH 2/2] azl4 --- src/azurelinux/4.0/helix/Dockerfile | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/azurelinux/4.0/helix/Dockerfile b/src/azurelinux/4.0/helix/Dockerfile index 46fbcb22a..bffb3aa8a 100644 --- a/src/azurelinux/4.0/helix/Dockerfile +++ b/src/azurelinux/4.0/helix/Dockerfile @@ -1,18 +1,3 @@ -FROM azlpubstagingacroxz2o4gw.azurecr.io/azurelinux/base/core:4.0 AS venv - -RUN dnf install --refresh -y \ - ca-certificates \ - iputils \ - python3 \ - python3-devel \ - python3-pip - -RUN python3 -m venv /venv && \ - source /venv/bin/activate && \ - pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ - pip install ./helix_scripts-*-py3-none-any.whl && \ - rm ./helix_scripts-*-py3-none-any.whl - FROM azlpubstagingacroxz2o4gw.azurecr.io/azurelinux/base/core:4.0 # Install .NET and test dependencies @@ -38,9 +23,3 @@ RUN /usr/sbin/useradd -c '' --uid 1000 --shell /bin/bash --groups adm helixbot & mkdir -p /home/helixbot/ && chown -R helixbot /home/helixbot/ USER helixbot - -# Install Helix Dependencies -ENV VIRTUAL_ENV=/home/helixbot/.vsts-env -RUN python3 -m venv $VIRTUAL_ENV -ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" -COPY --from=venv --chown=helixbot /venv $VIRTUAL_ENV