From 5b37234006b9a4e42fc92a68741e468c7b4eabe2 Mon Sep 17 00:00:00 2001
From: Sidney Prins <sidney.prins@mobiliteitsfabriek.nl>
Date: Mon, 28 Apr 2025 16:39:07 +0200
Subject: [PATCH] Update ubuntu 22.04 images to have the same software as 20.04

---
 ...nner-dind-rootless.ubuntu-22.04.dockerfile | 22 +++++++++++++++++++
 ...ctions-runner-dind.ubuntu-22.04.dockerfile | 22 +++++++++++++++++++
 runner/actions-runner.ubuntu-22.04.dockerfile | 21 ++++++++++++++++++
 3 files changed, 65 insertions(+)

diff --git a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
index 0639ccdf..d55dba34 100644
--- a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
+++ b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
@@ -20,17 +20,39 @@ RUN apt-get update -y \
     && add-apt-repository -y ppa:git-core/ppa \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
+    build-essential \
     curl \
     ca-certificates \
+    dnsutils \
+    ftp \
     git \
     iproute2 \
+    iputils-ping \
     iptables \
     jq \
+    libunwind8 \
+    locales \
+    netcat \
+    net-tools \
+    openssh-client \
+    parallel \
+    python3-pip \
+    rsync \
+    shellcheck \
+    software-properties-common \
     sudo \
+    telnet \
+    time \
+    tzdata \
     uidmap \
     unzip \
+    upx \
+    wget \
     zip \
+    zstd \
     fuse-overlayfs \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/lists/*
 
 # Download latest git-lfs version
diff --git a/runner/actions-runner-dind.ubuntu-22.04.dockerfile b/runner/actions-runner-dind.ubuntu-22.04.dockerfile
index 9e9ec866..436d28a3 100644
--- a/runner/actions-runner-dind.ubuntu-22.04.dockerfile
+++ b/runner/actions-runner-dind.ubuntu-22.04.dockerfile
@@ -17,15 +17,37 @@ RUN apt-get update -y \
     && add-apt-repository -y ppa:git-core/ppa \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
+    build-essential \
     curl \
     ca-certificates \
+    dnsutils \
+    ftp \
     git \
+    iproute2 \
+    iputils-ping \
     iptables \
     jq \
+    libunwind8 \
+    locales \
+    netcat \
+    net-tools \
+    openssh-client \
+    parallel \
+    python3-pip \
+    rsync \
+    shellcheck \
     software-properties-common \
     sudo \
+    telnet \
+    time \
+    tzdata \
     unzip \
+    upx \
+    wget \
     zip \
+    zstd \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/lists/*
 
 # Download latest git-lfs version
diff --git a/runner/actions-runner.ubuntu-22.04.dockerfile b/runner/actions-runner.ubuntu-22.04.dockerfile
index a8d31e39..8f1b88e5 100644
--- a/runner/actions-runner.ubuntu-22.04.dockerfile
+++ b/runner/actions-runner.ubuntu-22.04.dockerfile
@@ -17,13 +17,34 @@ RUN apt-get update -y \
     && add-apt-repository -y ppa:git-core/ppa \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
+    build-essential \
     curl \
     ca-certificates \
+    dnsutils \
+    ftp \
     git \
+    iproute2 \
+    iputils-ping \
     jq \
+    libunwind8 \
+    locales \
+    netcat \
+    openssh-client \
+    parallel \
+    python3-pip \
+    rsync \
+    shellcheck \
     sudo \
+    telnet \
+    time \
+    tzdata \
     unzip \
+    upx \
+    wget \
     zip \
+    zstd \
+    && ln -sf /usr/bin/python3 /usr/bin/python \
+    && ln -sf /usr/bin/pip3 /usr/bin/pip \
     && rm -rf /var/lib/apt/lists/*
 
 # Download latest git-lfs version