From f1f50693655c093d974f026bd37860d939cd5529 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 15 Aug 2023 05:32:11 +0000 Subject: [PATCH] Bug 1848294 - Upgrade system-symbol* docker images to Debian 12. r=gsvelto,taskgraph-reviewers,bhearsum Differential Revision: https://phabricator.services.mozilla.com/D185984 --- taskcluster/ci/docker-image/kind.yml | 6 +++--- .../docker/system-symbols-linux-scraper/Dockerfile | 7 ++----- taskcluster/docker/system-symbols-mac/setup.sh | 4 ++-- taskcluster/docker/system-symbols-win/Dockerfile | 3 +-- .../docker/system-symbols-win/requirements.txt | 14 +++++++------- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index db6734c8e29a..8e4ce83a910a 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -247,13 +247,13 @@ jobs: parent: debian11-base system-symbols-mac: symbol: I(system-symbols-mac) - parent: debian11-base + parent: debian12-base system-symbols-win: symbol: I(system-symbols-win) - parent: debian11-base + parent: debian12-base system-symbols-linux-scraper: symbol: I(system-symbols-linux) - parent: debian11-base + parent: debian12-base push-to-try: symbol: I(push-to-try) parent: debian11-base diff --git a/taskcluster/docker/system-symbols-linux-scraper/Dockerfile b/taskcluster/docker/system-symbols-linux-scraper/Dockerfile index 6f6e55a0a317..11729833fc5d 100644 --- a/taskcluster/docker/system-symbols-linux-scraper/Dockerfile +++ b/taskcluster/docker/system-symbols-linux-scraper/Dockerfile @@ -10,13 +10,10 @@ WORKDIR /builds/worker # AUFS slowness. VOLUME /builds/worker/checkouts -RUN echo "deb http://cdn.debian.net/debian bullseye-backports main" > /etc/apt/sources.list.d/bullseye-backports - RUN apt-get update && \ apt-get install --no-install-recommends -y \ - binutils build-essential cpio curl elfutils jq libxml2-utils \ + binutils build-essential cpio curl elfutils flatpak jq libxml2-utils \ python3-pip rpm2cpio squashfs-tools unzip wget zip && \ - apt-get install --no-install-recommends -y flatpak -t bullseye-backports && \ apt-get autoremove -y && rm -rf /var/lib/apt/lists/* COPY run.sh /builds/worker/run.sh @@ -25,7 +22,7 @@ COPY SHA256SUMS.txt /builds/worker/ RUN chown -R worker:worker /builds/worker -RUN pip3 install crashstats-tools==1.3.0 +RUN pip3 install --break-system-packages crashstats-tools==1.4.0 # Set a default command useful for debugging CMD ["/bin/bash", "--login"] diff --git a/taskcluster/docker/system-symbols-mac/setup.sh b/taskcluster/docker/system-symbols-mac/setup.sh index c0c4e766acb3..66ebb0010e1e 100644 --- a/taskcluster/docker/system-symbols-mac/setup.sh +++ b/taskcluster/docker/system-symbols-mac/setup.sh @@ -13,7 +13,7 @@ make "$ncpu" dmg-bin hfsplus cp dmg/dmg hfs/hfsplus /builds/worker/bin strip /builds/worker/bin/dmg /builds/worker/bin/hfsplus -pip3 install --no-cache-dir git+https://github.com/mozilla/reposado +pip3 install --break-system-packages --no-cache-dir git+https://github.com/mozilla/reposado@3dd826dfd89c8a1224aecf381637aa0bf90a3a3c python3 /usr/local/bin/repoutil --configure <