From 2791517e503b96a42432bda7d4fcef13a232e618 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 27 Nov 2023 14:12:04 +0100 Subject: [PATCH] Bump decision image to debian 12 Update the decision image's base from ubuntu 20.04 to debian 12. Use the opportunity to remove some dead code in the setup script. --- taskcluster/docker/decision/Dockerfile | 2 +- taskcluster/docker/decision/system-setup.sh | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/taskcluster/docker/decision/Dockerfile b/taskcluster/docker/decision/Dockerfile index 1f13efbbb..0f6bf0d02 100644 --- a/taskcluster/docker/decision/Dockerfile +++ b/taskcluster/docker/decision/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM debian:12 MAINTAINER Release Engineering # Add worker user diff --git a/taskcluster/docker/decision/system-setup.sh b/taskcluster/docker/decision/system-setup.sh index 8b8b6ad30..e61c05a2b 100644 --- a/taskcluster/docker/decision/system-setup.sh +++ b/taskcluster/docker/decision/system-setup.sh @@ -4,12 +4,9 @@ set -v -e test "$(whoami)" == 'root' -# Python 2 is still needed for mercurial 5.3.1 apt-get update apt-get install -y --force-yes --no-install-recommends \ ca-certificates \ - openssh-client \ - python \ python3 \ python3-pip \ python3-setuptools \ @@ -21,17 +18,6 @@ apt-get install -y --force-yes --no-install-recommends \ mercurial \ git -BUILD=/root/build -mkdir "$BUILD" - -tooltool_fetch() { - cat >manifest.tt - python3 /setup/tooltool.py fetch - rm manifest.tt -} - -cd $BUILD - # mercurial setup CERT_PATH=/etc/ssl/certs/ca-certificates.crt cat >/etc/mercurial/hgrc.d/cacerts.rc <