From c3393e6046578375c019fa5ecac731c6995b0819 Mon Sep 17 00:00:00 2001
From: Joakim Nordling <joakim.nordling@ioxio.com>
Date: Fri, 6 Jun 2025 15:43:49 +0300
Subject: [PATCH] Remove Ubuntu 22.04 based images

Remove all the Ubuntu 22.04 based images. They were used with old Node 18 and Python 3.11.
---
 nodejs-base/ubuntu22.04-node18/.trivyignore   | 17 ------
 nodejs-base/ubuntu22.04-node18/Dockerfile     | 22 --------
 nodejs-base/ubuntu22.04-node18/config.yaml    |  3 -
 .../ubuntu22.04-node18/docker/base-prepare.sh | 34 ------------
 .../docker/scripts/create_user.sh             | 13 -----
 .../docker/scripts/install_multi_start.sh     | 19 -------
 .../docker/scripts/install_node.sh            | 14 -----
 .../.trivyignore                              | 10 ----
 .../Dockerfile                                | 11 ----
 .../config.yaml                               |  1 -
 .../docker/base-prepare.sh                    | 26 ---------
 .../docker/scripts/install_node.sh            | 14 -----
 .../ubuntu22.04-python3.11-nginx/.trivyignore |  5 --
 .../ubuntu22.04-python3.11-nginx/Dockerfile   | 17 ------
 .../ubuntu22.04-python3.11-nginx/config.yaml  |  1 -
 .../docker/base-prepare.sh                    | 55 -------------------
 .../ubuntu22.04-python3.11/.trivyignore       |  4 --
 python-base/ubuntu22.04-python3.11/Dockerfile | 32 -----------
 .../ubuntu22.04-python3.11/config.yaml        |  4 --
 .../docker/base-prepare.sh                    | 39 -------------
 .../docker/scripts/configure_poetry.sh        |  7 ---
 .../docker/scripts/create_user.sh             | 13 -----
 .../docker/scripts/install_multi_start.sh     | 12 ----
 .../docker/scripts/install_poetry.sh          | 20 -------
 .../docker/scripts/install_python.sh          | 20 -------
 .../docker/scripts/prepare_workon_dir.sh      | 11 ----
 settings.py                                   |  3 -
 ubuntu-base/22.04/Dockerfile                  | 16 ------
 ubuntu-base/22.04/config.yaml                 |  1 -
 29 files changed, 444 deletions(-)
 delete mode 100644 nodejs-base/ubuntu22.04-node18/.trivyignore
 delete mode 100644 nodejs-base/ubuntu22.04-node18/Dockerfile
 delete mode 100644 nodejs-base/ubuntu22.04-node18/config.yaml
 delete mode 100644 nodejs-base/ubuntu22.04-node18/docker/base-prepare.sh
 delete mode 100644 nodejs-base/ubuntu22.04-node18/docker/scripts/create_user.sh
 delete mode 100644 nodejs-base/ubuntu22.04-node18/docker/scripts/install_multi_start.sh
 delete mode 100644 nodejs-base/ubuntu22.04-node18/docker/scripts/install_node.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx-node18/.trivyignore
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx-node18/Dockerfile
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx-node18/config.yaml
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx-node18/docker/base-prepare.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx-node18/docker/scripts/install_node.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx/.trivyignore
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx/Dockerfile
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx/config.yaml
 delete mode 100644 python-base/ubuntu22.04-python3.11-nginx/docker/base-prepare.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/.trivyignore
 delete mode 100644 python-base/ubuntu22.04-python3.11/Dockerfile
 delete mode 100644 python-base/ubuntu22.04-python3.11/config.yaml
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/base-prepare.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/configure_poetry.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/create_user.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/install_multi_start.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/install_poetry.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/install_python.sh
 delete mode 100644 python-base/ubuntu22.04-python3.11/docker/scripts/prepare_workon_dir.sh
 delete mode 100644 ubuntu-base/22.04/Dockerfile
 delete mode 100644 ubuntu-base/22.04/config.yaml

diff --git a/nodejs-base/ubuntu22.04-node18/.trivyignore b/nodejs-base/ubuntu22.04-node18/.trivyignore
deleted file mode 100644
index e007e203..00000000
--- a/nodejs-base/ubuntu22.04-node18/.trivyignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# Not running an OpenSSL TLS server
-CVE-2021-3449
-
-# Not parsing elliptic curve keys
-CVE-2022-0778
-
-# A heap out-of-bounds write vulnerability in the Linux Kernel ipvlan network driver
-CVE-2023-3090
-
-#X.400 address type confusion in X.509 GeneralName
-CVE-2023-0286
-
-# pypa-setuptools: Regular Expression Denial of Service (ReDoS) in package_index.py
-CVE-2022-40897
-
-# Kernel vulnerability that likely does not affect us and no update yet
-CVE-2024-26597
diff --git a/nodejs-base/ubuntu22.04-node18/Dockerfile b/nodejs-base/ubuntu22.04-node18/Dockerfile
deleted file mode 100644
index aa5e8b37..00000000
--- a/nodejs-base/ubuntu22.04-node18/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG LOCAL_REGISTRY=""
-FROM ${LOCAL_REGISTRY}ubuntu-base:22.04
-
-ENV \
-    DEBIAN_FRONTEND="noninteractive" \
-    GID=1000 \
-    GROUP="api" \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    TZ="UTC" \
-    UID=1000 \
-    USER="api" \
-    ENV_LAST_LINE="LEAVE-ME-HERE"
-
-# Run docker/base-prepare.sh
-WORKDIR /src/
-COPY docker /src/docker
-RUN : \
- && set -exu \
- && bash /src/docker/base-prepare.sh \
- && rm -rf /src/docker \
- && :
diff --git a/nodejs-base/ubuntu22.04-node18/config.yaml b/nodejs-base/ubuntu22.04-node18/config.yaml
deleted file mode 100644
index adea25df..00000000
--- a/nodejs-base/ubuntu22.04-node18/config.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tags:
-  - ubuntu-node18
-  - lts-node18
diff --git a/nodejs-base/ubuntu22.04-node18/docker/base-prepare.sh b/nodejs-base/ubuntu22.04-node18/docker/base-prepare.sh
deleted file mode 100644
index 5f3729a1..00000000
--- a/nodejs-base/ubuntu22.04-node18/docker/base-prepare.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# WARNING!
-# ========
-#
-# THIS FILE IS NOT USED IN RUNTIME, ONLY WHILE BUILDING DOCKER IMAGES
-# DO NOT ADD ANYTHING RUNTIME OR ENVIRONMENT SPECIFIC HERE
-#
-# This file is for installing the larger dependencies that rarely change such
-# as OS packages, utilities and so on, for the build environment
-#
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-bash /src/docker/scripts/create_user.sh
-
-apt-get update
-apt-get install -y --no-install-recommends \
-  curl \
-  ca-certificates \
-# This line is intentionally empty to preserve trailing \ in previous list
-
-bash /src/docker/scripts/install_node.sh
-bash /src/docker/scripts/install_multi_start.sh
-
-# Allow the next script to run as ${USER}
-chown -R "${USER}":"${GROUP}" /src
-
-# Cleanup
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-rm -rf /root/.cache
-rm -rf /usr/share/doc
diff --git a/nodejs-base/ubuntu22.04-node18/docker/scripts/create_user.sh b/nodejs-base/ubuntu22.04-node18/docker/scripts/create_user.sh
deleted file mode 100644
index 05e0cdd5..00000000
--- a/nodejs-base/ubuntu22.04-node18/docker/scripts/create_user.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Create user
-addgroup --system --gid "${GID}" "${GROUP}"
-useradd \
-  --uid "${UID}" \
-  --shell /bin/bash \
-  --gid "${GID}" \
-  --create-home \
-  "${USER}"
diff --git a/nodejs-base/ubuntu22.04-node18/docker/scripts/install_multi_start.sh b/nodejs-base/ubuntu22.04-node18/docker/scripts/install_multi_start.sh
deleted file mode 100644
index 7d2ef902..00000000
--- a/nodejs-base/ubuntu22.04-node18/docker/scripts/install_multi_start.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Install pipx
-apt-get update
-apt-get install -y \
-    python3-pip \
-    python3-venv
-python3 -m pip install --user -U pipx
-/root/.local/bin/pipx ensurepath
-export PATH="/root/.local/bin:$PATH"
-
-# Install multi-start and make it available for all users
-PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install multi-start
-
-# cleanup
-apt-get remove -y python3-pip
diff --git a/nodejs-base/ubuntu22.04-node18/docker/scripts/install_node.sh b/nodejs-base/ubuntu22.04-node18/docker/scripts/install_node.sh
deleted file mode 100644
index 7a3f685a..00000000
--- a/nodejs-base/ubuntu22.04-node18/docker/scripts/install_node.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Set up nodesource repository
-curl -sL https://deb.nodesource.com/setup_18.x | bash -
-
-# Install Node
-apt-get update
-apt-get install -y --no-install-recommends nodejs
-
-# Install sane package managers
-npm install -g pnpm@latest-9 yarn
diff --git a/python-base/ubuntu22.04-python3.11-nginx-node18/.trivyignore b/python-base/ubuntu22.04-python3.11-nginx-node18/.trivyignore
deleted file mode 100644
index 639c5a8c..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx-node18/.trivyignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# Not affected
-CVE-2022-42919
-CVE-2021-3449
-CVE-2022-0778
-
-#X.400 address type confusion in X.509 GeneralName
-CVE-2023-0286
-
-# pypa-setuptools: Regular Expression Denial of Service (ReDoS) in package_index.py
-CVE-2022-40897
diff --git a/python-base/ubuntu22.04-python3.11-nginx-node18/Dockerfile b/python-base/ubuntu22.04-python3.11-nginx-node18/Dockerfile
deleted file mode 100644
index 5a62cc11..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx-node18/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-ARG LOCAL_REGISTRY=""
-FROM ${LOCAL_REGISTRY}python-base:ubuntu22.04-python3.11-nginx
-
-# Run docker/base-prepare.sh
-WORKDIR /src/
-COPY docker /src/docker
-RUN : \
- && set -exu \
- && bash /src/docker/base-prepare.sh \
- && rm -rf /src/docker \
- && :
diff --git a/python-base/ubuntu22.04-python3.11-nginx-node18/config.yaml b/python-base/ubuntu22.04-python3.11-nginx-node18/config.yaml
deleted file mode 100644
index 7793f851..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx-node18/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-tags: []
diff --git a/python-base/ubuntu22.04-python3.11-nginx-node18/docker/base-prepare.sh b/python-base/ubuntu22.04-python3.11-nginx-node18/docker/base-prepare.sh
deleted file mode 100644
index bc12ede6..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx-node18/docker/base-prepare.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-#
-# WARNING!
-# ========
-#
-# THIS FILE IS NOT USED IN RUNTIME, ONLY WHILE BUILDING DOCKER IMAGES
-# DO NOT ADD ANYTHING RUNTIME OR ENVIRONMENT SPECIFIC HERE
-#
-# This file is for installing the larger dependencies that rarely change such
-# as OS packages, utilities and so on, for the build environment
-#
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Install system dependencies
-apt-get update
-apt-get install -y --no-install-recommends \
-  curl \
-# This line is intentionally empty to preserve trailing \ in previous list
-
-bash /src/docker/scripts/install_node.sh
-
-# Clean up
-apt-get clean
-rm -rf /var/lib/apt/lists/*
diff --git a/python-base/ubuntu22.04-python3.11-nginx-node18/docker/scripts/install_node.sh b/python-base/ubuntu22.04-python3.11-nginx-node18/docker/scripts/install_node.sh
deleted file mode 100644
index 7a3f685a..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx-node18/docker/scripts/install_node.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Set up nodesource repository
-curl -sL https://deb.nodesource.com/setup_18.x | bash -
-
-# Install Node
-apt-get update
-apt-get install -y --no-install-recommends nodejs
-
-# Install sane package managers
-npm install -g pnpm@latest-9 yarn
diff --git a/python-base/ubuntu22.04-python3.11-nginx/.trivyignore b/python-base/ubuntu22.04-python3.11-nginx/.trivyignore
deleted file mode 100644
index 823f6a6b..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx/.trivyignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# local privilege escalation via the multiprocessing forkserver start method
-CVE-2022-42919
-
-# pypa-setuptools: Regular Expression Denial of Service (ReDoS) in package_index.py
-CVE-2022-40897
diff --git a/python-base/ubuntu22.04-python3.11-nginx/Dockerfile b/python-base/ubuntu22.04-python3.11-nginx/Dockerfile
deleted file mode 100644
index 83dee942..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-ARG LOCAL_REGISTRY=""
-FROM ${LOCAL_REGISTRY}python-base:ubuntu22.04-python3.11
-
-ENV \
-    PARSE_TEMPLATE_HASH_X86_64="dcfbc9e843292664aab43cd942694019ae566dc6ab83567f4339e942da76360b" \
-    PARSE_TEMPLATE_HASH_ARM64="d305ac32e970bf12572e67e5aa09e202b2b49279a4aaa81000bb7ae94b179648" \
-    PARSE_TEMPLATE_VERSION="v1.0.1" \
-    ENV_LAST_LINE="LEAVE-ME-HERE"
-
-# Run docker/base-prepare.sh
-WORKDIR /src/
-COPY docker /src/docker
-RUN : \
- && set -exu \
- && bash /src/docker/base-prepare.sh \
- && rm -rf /src/docker \
- && :
diff --git a/python-base/ubuntu22.04-python3.11-nginx/config.yaml b/python-base/ubuntu22.04-python3.11-nginx/config.yaml
deleted file mode 100644
index 7793f851..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-tags: []
diff --git a/python-base/ubuntu22.04-python3.11-nginx/docker/base-prepare.sh b/python-base/ubuntu22.04-python3.11-nginx/docker/base-prepare.sh
deleted file mode 100644
index 5332e4ae..00000000
--- a/python-base/ubuntu22.04-python3.11-nginx/docker/base-prepare.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-#
-# WARNING!
-# ========
-#
-# THIS FILE IS NOT USED IN RUNTIME, ONLY WHILE BUILDING DOCKER IMAGES
-# DO NOT ADD ANYTHING RUNTIME OR ENVIRONMENT SPECIFIC HERE
-#
-# This file is for installing the larger dependencies that rarely change such
-# as OS packages, utilities and so on, for the build environment
-#
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Install system dependencies
-apt-get update
-apt-get install -y --no-install-recommends \
-  nginx \
-  curl \
-# This line is intentionally empty to preserve trailing \ in previous list
-
-# Install parse-template
-ARCH=$(uname -m)
-if [ "${ARCH}" = "x86_64" ]; then
-  curl -L -o /usr/bin/parse-template \
-      "https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_x86_64"
-  echo "${PARSE_TEMPLATE_HASH_X86_64}  /usr/bin/parse-template" | sha256sum -c
-elif [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then
-  curl -L -o /usr/bin/parse-template \
-      "https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_arm64"
-  echo "${PARSE_TEMPLATE_HASH_ARM64}  /usr/bin/parse-template" | sha256sum -c
-else
-  echo "Unsupported architecture: ${ARCH}"
-  exit 1
-fi
-chmod +x /usr/bin/parse-template
-
-# ---------------
-# Nginx configuration
-# ---------------
-# This is where logs will be stored. It should be accessible by ${USER}
-mkdir /run/nginx
-chown -R "${USER}:${GROUP}" /run/nginx
-# Make /var/lib/nginx/logs/error.log be accessible by ${USER}
-# Somehow it's still being created, however `error_log` is set
-chown -R "${USER}:${GROUP}" /var/lib/nginx /var/log/nginx
-# Forward nginx errors to stderr
-ln -sf /dev/stderr /run/nginx/error.log
-
-# Clean up
-apt-get remove -y \
-  curl
-apt-get clean
-rm -rf /var/lib/apt/lists/*
diff --git a/python-base/ubuntu22.04-python3.11/.trivyignore b/python-base/ubuntu22.04-python3.11/.trivyignore
deleted file mode 100644
index f8101d33..00000000
--- a/python-base/ubuntu22.04-python3.11/.trivyignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Unfixable atm: https://avd.aquasec.com/nvd/2022/cve-2022-42919/
-CVE-2022-42919
-# Not relevant: https://avd.aquasec.com/nvd/2022/cve-2022-40897/
-CVE-2022-40897
diff --git a/python-base/ubuntu22.04-python3.11/Dockerfile b/python-base/ubuntu22.04-python3.11/Dockerfile
deleted file mode 100644
index 937f7f12..00000000
--- a/python-base/ubuntu22.04-python3.11/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-ARG LOCAL_REGISTRY=""
-FROM ${LOCAL_REGISTRY}ubuntu-base:22.04
-
-ENV \
-    DEBIAN_FRONTEND="noninteractive" \
-    GID=1000 \
-    GROUP="api" \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    PATH="${PATH}:/.venv:/usr/local/poetry/bin" \
-    POETRY_HOME="/usr/local/poetry" \
-    POETRY_VERSION="1.8.2" \
-    PYTHONUNBUFFERED=1 \
-    PYTHON_VERSION="3.11" \
-    TZ="UTC" \
-    UID=1000 \
-    USER="api" \
-    WORKON_HOME="/.venv" \
-    # Workardound for issue with broken virtual environments. For more details see:
-    # https://github.com/python-poetry/install.python-poetry.org/blob/main/README.md#debianubuntu
-    # https://github.com/python-poetry/poetry/issues/6371#issuecomment-1235764346
-    DEB_PYTHON_INSTALL_LAYOUT=deb \
-    ENV_LAST_LINE="LEAVE-ME-HERE"
-
-# Run docker/base-prepare.sh
-WORKDIR /src/
-COPY docker /src/docker
-RUN : \
- && set -exu \
- && bash /src/docker/base-prepare.sh \
- && rm -rf /src/docker \
- && :
diff --git a/python-base/ubuntu22.04-python3.11/config.yaml b/python-base/ubuntu22.04-python3.11/config.yaml
deleted file mode 100644
index 23bebbd6..00000000
--- a/python-base/ubuntu22.04-python3.11/config.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tags:
-  - ubuntu-python3.11
-  - ubuntu-python3.11-poetry1.8.2
-  - ubuntu22.04-python3.11-poetry1.8.2
diff --git a/python-base/ubuntu22.04-python3.11/docker/base-prepare.sh b/python-base/ubuntu22.04-python3.11/docker/base-prepare.sh
deleted file mode 100644
index d08e5321..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/base-prepare.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#
-# WARNING!
-# ========
-#
-# THIS FILE IS NOT USED IN RUNTIME, ONLY WHILE BUILDING DOCKER IMAGES
-# DO NOT ADD ANYTHING RUNTIME OR ENVIRONMENT SPECIFIC HERE
-#
-# This file is for installing the larger dependencies that rarely change such
-# as OS packages, utilities and so on, for the build environment
-#
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-bash /src/docker/scripts/create_user.sh
-
-apt-get update
-apt-get upgrade -y
-apt-get install -y --no-install-recommends \
-  curl \
-  ca-certificates \
-# This line is intentionally empty to preserve trailing \ in previous list
-
-bash /src/docker/scripts/install_python.sh
-bash /src/docker/scripts/prepare_workon_dir.sh
-bash /src/docker/scripts/install_poetry.sh
-bash /src/docker/scripts/install_multi_start.sh
-
-# Allow the next script to run as ${USER}
-chown -R "${USER}":"${GROUP}" /src
-
-bash /src/docker/scripts/configure_poetry.sh
-
-# Cleanup
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-rm -rf /root/.cache
-rm -rf /usr/share/doc
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/configure_poetry.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/configure_poetry.sh
deleted file mode 100644
index ecbd9e07..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/configure_poetry.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-su "${USER}" -c ". ${POETRY_HOME}/env; poetry config virtualenvs.in-project false"
-su "${USER}" -c ". ${POETRY_HOME}/env; poetry config virtualenvs.path ${WORKON_HOME}"
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/create_user.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/create_user.sh
deleted file mode 100644
index 05e0cdd5..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/create_user.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Create user
-addgroup --system --gid "${GID}" "${GROUP}"
-useradd \
-  --uid "${UID}" \
-  --shell /bin/bash \
-  --gid "${GID}" \
-  --create-home \
-  "${USER}"
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/install_multi_start.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/install_multi_start.sh
deleted file mode 100644
index 40bbd5f1..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/install_multi_start.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Install pipx
-"python${PYTHON_VERSION}" -m pip install --user -U pipx
-/root/.local/bin/pipx ensurepath
-export PATH="/root/.local/bin:$PATH"
-
-# Install multi-start and make it available for all users
-PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install multi-start
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/install_poetry.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/install_poetry.sh
deleted file mode 100644
index 505030cf..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/install_poetry.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-POETRY_URL="https://install.python-poetry.org"
-
-mkdir "${POETRY_HOME}"
-chown -R "${USER}":"${GROUP}" "${POETRY_HOME}"
-
-su "${USER}" -c "curl -sSL ${POETRY_URL} | python - --version ${POETRY_VERSION}"
-# Create the env file manually; installers prior to 1.2.0 created this by default
-su "${USER}" -c "echo \"export PATH=\\\"${POETRY_HOME}/bin:\\\$PATH\\\"\" > \"${POETRY_HOME}/env\""
-
-chmod +x "${POETRY_HOME}"/bin/*
-
-# Make poetry available from PATH always
-ln -sf "${POETRY_HOME}/bin/poetry" /usr/bin/poetry
-
-bash /src/docker/scripts/configure_poetry.sh
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/install_python.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/install_python.sh
deleted file mode 100644
index a01be8e7..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/install_python.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Deadsnakes PPA is the only way to get stable Python 3.11 for Ubuntu 22.04
-apt-get install -y software-properties-common
-add-apt-repository ppa:deadsnakes/ppa -y
-
-# Install python
-apt-get install -y --no-install-recommends \
-  "python${PYTHON_VERSION}" \
-  "python${PYTHON_VERSION}-venv" \
-  python3-distutils
-
-# Set python active
-update-alternatives --install /usr/bin/python python "/usr/bin/python${PYTHON_VERSION}" 10
-
-# Install Pip
-curl https://bootstrap.pypa.io/get-pip.py | python
diff --git a/python-base/ubuntu22.04-python3.11/docker/scripts/prepare_workon_dir.sh b/python-base/ubuntu22.04-python3.11/docker/scripts/prepare_workon_dir.sh
deleted file mode 100644
index 6e4f289b..00000000
--- a/python-base/ubuntu22.04-python3.11/docker/scripts/prepare_workon_dir.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck disable=SC2039
-set -exuo pipefail
-
-# Ensure the WORKON_HOME exists, is empty and owned by ${USER}
-if [[ ! -d "${WORKON_HOME}" ]]; then
-  mkdir "${WORKON_HOME}"
-fi
-rm -rf "${WORKON_HOME:?}"/*
-chown -R "${USER}":"${GROUP}" "${WORKON_HOME}"
diff --git a/settings.py b/settings.py
index 20dd63e5..a9eef0bc 100644
--- a/settings.py
+++ b/settings.py
@@ -11,16 +11,13 @@ class Settings(BaseSettings):
     # List of images that should be built beforehand
     PRIORITY_BUILDS = [
         [
-            "ubuntu-base/22.04",
             "ubuntu-base/24.04",
             "nginx-base/alpine-nginx",
         ],
         [
-            "python-base/ubuntu22.04-python3.11",
             "python-base/ubuntu24.04-python3.13",
         ],
         [
-            "python-base/ubuntu22.04-python3.11-nginx",
             "python-base/ubuntu24.04-python3.13-nginx",
         ],
     ]
diff --git a/ubuntu-base/22.04/Dockerfile b/ubuntu-base/22.04/Dockerfile
deleted file mode 100644
index 827a3c77..00000000
--- a/ubuntu-base/22.04/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:22.04
-
-ENV \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    TZ="UTC" \
-    ENV_LAST_LINE="LEAVE-ME-HERE"
-
-RUN : \
- && apt-get update \
- && apt-get upgrade -y \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/* \
- && rm -rf /root/.cache \
- && rm -rf /usr/share/doc \
- && :
diff --git a/ubuntu-base/22.04/config.yaml b/ubuntu-base/22.04/config.yaml
deleted file mode 100644
index 7793f851..00000000
--- a/ubuntu-base/22.04/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-tags: []