From 411a79d2caa02d2acfd6b28b4413d1ddcf02047e Mon Sep 17 00:00:00 2001 From: Aaron Pop Date: Wed, 2 Sep 2026 11:05:19 -0700 Subject: [PATCH] Containers: Add i386 arch support Required for ia32 host based unit tests when using GCC under the container. --- .sync/containers/Ubuntu-22/Dockerfile | 6 +++++- .sync/containers/Ubuntu-24/Dockerfile | 6 +++++- Containers/Ubuntu-22/Dockerfile | 6 +++++- Containers/Ubuntu-24/Dockerfile | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.sync/containers/Ubuntu-22/Dockerfile b/.sync/containers/Ubuntu-22/Dockerfile index ffe2c747..1409ce49 100644 --- a/.sync/containers/Ubuntu-22/Dockerfile +++ b/.sync/containers/Ubuntu-22/Dockerfile @@ -42,7 +42,8 @@ ENV TZ=UTC # the .local/bin directory to the path which will be used by pip. ENV PATH $PATH:/home/vsts_azpcontainer/.local/bin -RUN apt-get update && \ +RUN dpkg --add-architecture i386 && \ + apt-get update && \ apt-get install --yes --no-install-recommends \ bison \ ca-certificates \ @@ -68,6 +69,9 @@ RUN apt-get update && \ unzip \ uuid-dev \ wget \ + libc6-i386 \ + libc6-dev-i386 \ + linux-libc-dev:i386 \ && \ apt-get update && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \ diff --git a/.sync/containers/Ubuntu-24/Dockerfile b/.sync/containers/Ubuntu-24/Dockerfile index 273c051d..b507a918 100644 --- a/.sync/containers/Ubuntu-24/Dockerfile +++ b/.sync/containers/Ubuntu-24/Dockerfile @@ -42,7 +42,8 @@ ENV TZ=UTC # the .local/bin directory to the path which will be used by pip. ENV PATH $PATH:/home/vsts_azpcontainer/.local/bin -RUN apt-get update && \ +RUN dpkg --add-architecture i386 && \ + apt-get update && \ apt-get install --yes --no-install-recommends \ bison \ ca-certificates \ @@ -70,6 +71,9 @@ RUN apt-get update && \ unzip \ uuid-dev \ wget \ + libc6-i386 \ + libc6-dev-i386 \ + linux-libc-dev:i386 \ && \ apt-get update && \ apt-get install --yes --no-install-recommends \ diff --git a/Containers/Ubuntu-22/Dockerfile b/Containers/Ubuntu-22/Dockerfile index ba8ef08f..e891028e 100644 --- a/Containers/Ubuntu-22/Dockerfile +++ b/Containers/Ubuntu-22/Dockerfile @@ -39,7 +39,8 @@ ENV TZ=UTC # the .local/bin directory to the path which will be used by pip. ENV PATH $PATH:/home/vsts_azpcontainer/.local/bin -RUN apt-get update && \ +RUN dpkg --add-architecture i386 && \ + apt-get update && \ apt-get install --yes --no-install-recommends \ bison \ ca-certificates \ @@ -65,6 +66,9 @@ RUN apt-get update && \ unzip \ uuid-dev \ wget \ + libc6-i386 \ + libc6-dev-i386 \ + linux-libc-dev:i386 \ && \ apt-get update && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys F23C5A6CF475977595C89F51BA6932366A755776 && \ diff --git a/Containers/Ubuntu-24/Dockerfile b/Containers/Ubuntu-24/Dockerfile index 8cdbbefd..d232cc59 100644 --- a/Containers/Ubuntu-24/Dockerfile +++ b/Containers/Ubuntu-24/Dockerfile @@ -39,7 +39,8 @@ ENV TZ=UTC # the .local/bin directory to the path which will be used by pip. ENV PATH $PATH:/home/vsts_azpcontainer/.local/bin -RUN apt-get update && \ +RUN dpkg --add-architecture i386 && \ + apt-get update && \ apt-get install --yes --no-install-recommends \ bison \ ca-certificates \ @@ -67,6 +68,9 @@ RUN apt-get update && \ unzip \ uuid-dev \ wget \ + libc6-i386 \ + libc6-dev-i386 \ + linux-libc-dev:i386 \ && \ apt-get update && \ apt-get install --yes --no-install-recommends \