From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:19:15 +0000 (+0100)
Subject: [3.13] gh-124612: Use ghcr.io/python/autoconf instead of public image (GH-124657... 
X-Git-Tag: v3.13.1~200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d24ea899e81e9aa5457c8563b1782f2b481f1b0d;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-124612: Use ghcr.io/python/autoconf instead of public image (GH-124657) (#126183)

(cherry picked from commit b502573f7f800dbb2e401fa2a7a05eceac692c7a)

Co-authored-by: Donghee Na <donghee.na@python.org>
---

diff --git a/Tools/build/regen-configure.sh b/Tools/build/regen-configure.sh
index 0a23318a2f37..a267cfb7f5ca 100755
--- a/Tools/build/regen-configure.sh
+++ b/Tools/build/regen-configure.sh
@@ -5,12 +5,10 @@ set -e -x
 # The check_autoconf_regen job of .github/workflows/build.yml must kept in
 # sync with this script. Use the same container image than the job so the job
 # doesn't need to run autoreconf in a container.
-IMAGE="ubuntu:22.04"
-DEPENDENCIES="autotools-dev autoconf autoconf-archive pkg-config"
+IMAGE="ghcr.io/python/autoconf:2024.10.06.11200919239"
 AUTORECONF="autoreconf -ivf -Werror"
 
 WORK_DIR="/src"
-SHELL_CMD="apt-get update && apt-get -yq install $DEPENDENCIES && cd $WORK_DIR && $AUTORECONF"
 
 abs_srcdir=$(cd $(dirname $0)/../..; pwd)
 
@@ -28,4 +26,4 @@ if command -v selinuxenabled >/dev/null && selinuxenabled; then
     PATH_OPT=":Z"
 fi
 
-"$RUNTIME" run --rm -v "$abs_srcdir:$WORK_DIR$PATH_OPT" "$IMAGE" /usr/bin/bash -c "$SHELL_CMD"
+"$RUNTIME" run --rm -v "$abs_srcdir:$WORK_DIR$PATH_OPT" "$IMAGE"