Skip to content

Commit

Permalink
Bump decision image to debian 12
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jcristau committed Nov 30, 2023
1 parent 14152d8 commit 2791517
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 21 deletions.
2 changes: 1 addition & 1 deletion taskcluster/docker/decision/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM debian:12
MAINTAINER Release Engineering <[email protected]>

# Add worker user
Expand Down
21 changes: 1 addition & 20 deletions taskcluster/docker/decision/system-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 <<EOF
Expand All @@ -41,13 +27,8 @@ EOF
chmod 644 /etc/mercurial/hgrc.d/cacerts.rc
chmod 644 /usr/local/mercurial/robustcheckout.py

# Using pip3 directly results in a warning that a "very old" wrapper is being
# used, and that support for this will be deprecated.
python3 -mpip install --upgrade pip~=21.1.3
python3 -mpip install -r /setup/requirements.txt
python3 -mpip install --break-system-packages -r /setup/requirements.txt

cd /
rm -rf $BUILD
apt-get clean
apt-get autoclean
rm -rf /var/lib/apt/lists/
Expand Down

0 comments on commit 2791517

Please sign in to comment.