From a84b3b246528145f9535bba3ca0d403970ce2722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2026 15:54:15 +0000 Subject: [PATCH 1/2] chore(deps): bump ubuntu Bumps the docker group with 1 update in the /tfroot-runner directory: ubuntu. Updates `ubuntu` from 24.04 to 26.04 --- updated-dependencies: - dependency-name: ubuntu dependency-version: '26.04' dependency-type: direct:production dependency-group: docker ... Signed-off-by: dependabot[bot] --- tfroot-runner/Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfroot-runner/Containerfile b/tfroot-runner/Containerfile index ad7b058..aed6216 100644 --- a/tfroot-runner/Containerfile +++ b/tfroot-runner/Containerfile @@ -17,7 +17,7 @@ ARG PYTHON_VERSION=3.14 ARG YQ_VERSION=4.53.3 ARG ACTIONS_RUNNER_VERSION=2.336.0 -FROM --platform=linux/amd64 ubuntu:24.04 AS tools +FROM --platform=linux/amd64 ubuntu:26.04 AS tools ARG OPENTOFU_VERSION ARG SOPS_VERSION From 418e6af46fd10666b5d73a0bf549b5b1d27291df Mon Sep 17 00:00:00 2001 From: xnoto Date: Tue, 25 Aug 2026 11:44:46 -0600 Subject: [PATCH 2/2] fix: add deadsnakes ppa only when distro lacks the pinned python Ubuntu 26.04 (resolute) ships Python 3.14 upstream; deadsnakes has no resolute builds, so adding the PPA 404s apt-get update and the build fails. --- tfroot-runner/Containerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tfroot-runner/Containerfile b/tfroot-runner/Containerfile index aed6216..9e3dafd 100644 --- a/tfroot-runner/Containerfile +++ b/tfroot-runner/Containerfile @@ -37,8 +37,9 @@ ENV DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl gnupg lsb-release software-properties-common unzip \ - && add-apt-repository -y ppa:deadsnakes/ppa \ - && apt-get update && apt-get install -y --no-install-recommends \ + && (apt-cache show python${PYTHON_VERSION} > /dev/null 2>&1 \ + || (add-apt-repository -y ppa:deadsnakes/ppa && apt-get update)) \ + && apt-get install -y --no-install-recommends \ python${PYTHON_VERSION} python${PYTHON_VERSION}-venv python${PYTHON_VERSION}-dev \ build-essential libffi-dev git \ && rm -rf /var/lib/apt/lists/* @@ -97,8 +98,9 @@ ENV DEBIAN_FRONTEND=noninteractive # hadolint ignore=DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates curl unzip software-properties-common \ - && add-apt-repository -y ppa:deadsnakes/ppa \ - && apt-get update && apt-get install -y --no-install-recommends \ + && (apt-cache show python${PYTHON_VERSION} > /dev/null 2>&1 \ + || (add-apt-repository -y ppa:deadsnakes/ppa && apt-get update)) \ + && apt-get install -y --no-install-recommends \ python${PYTHON_VERSION} python${PYTHON_VERSION}-venv \ ansible-core openssh-client \ jq genisoimage gnupg make shellcheck libatomic1 \