use jammy as default release

Dockerfile

@@ -1,4 +1,4 @@
-ARG     OS_RELEASE=bionic
+ARG     OS_RELEASE=jammy
 FROM    pidtree-docker-base-bcc-${OS_RELEASE}
 
 # Build python environment

Dockerfile.base

@@ -1,2 +1,2 @@
-ARG     BASE_IMAGE=ubuntu:bionic
+ARG     BASE_IMAGE=ubuntu:jammy
 FROM    ${BASE_IMAGE}

Dockerfile.bcc

@@ -1,4 +1,4 @@
-ARG     OS_RELEASE=bionic
+ARG     OS_RELEASE=jammy
 FROM    pidtree-docker-base-${OS_RELEASE} as builder
 ARG     BCC_TOOLS_SOURCE=source
 ARG     BCC_VERSION=0.19.0

Makefile

@@ -7,7 +7,7 @@ FIFO = $(CURDIR)/pidtree-bcc.fifo
 EXTRA_DOCKER_ARGS ?=
 DOCKER_ARGS = $(EXTRA_DOCKER_ARGS) -v /etc/passwd:/etc/passwd:ro --privileged --cap-add sys_admin --pid host
 DOCKER_BASE_IMAGE_TMPL ?= ubuntu:OS_RELEASE_PH
-HOST_OS_RELEASE = $(or $(shell cat /etc/lsb-release 2>/dev/null | grep -Po '(?<=CODENAME=)(.+)'), bionic)
+HOST_OS_RELEASE = $(or $(shell cat /etc/lsb-release 2>/dev/null | grep -Po '(?<=CODENAME=)(.+)'), jammy)
 SUPPORTED_UBUNTU_RELEASES = bionic focal jammy noble
 UPSTREAM_BCC_RELEASES = jammy noble
 VERSION_FILE = $(PWD)/pidtree_bcc/__init__.py

itest/itest_autoreload.sh

@@ -50,8 +50,8 @@ touch $TOPLEVEL/$OUTPUT_NAME
 if [ -f /etc/lsb-release ]; then
     source /etc/lsb-release
 else
-    echo "WARNING: Could not source /etc/lsb-release, tentatively creating bionic docker image"
-    DISTRIB_CODENAME=bionic
+    echo "WARNING: Could not source /etc/lsb-release, tentatively creating jammy docker image"
+    DISTRIB_CODENAME=jammy
 fi
 docker build -t pidtree-itest-base --build-arg OS_RELEASE=$DISTRIB_CODENAME .
 docker build -t pidtree-itest itest

itest/itest_generic.sh

@@ -95,8 +95,8 @@ function main {
     if [ -f /etc/lsb-release ]; then
       source /etc/lsb-release
     else
-      echo "WARNING: Could not source /etc/lsb-release, tentatively creating bionic docker image"
-      DISTRIB_CODENAME=bionic
+      echo "WARNING: Could not source /etc/lsb-release, tentatively creating jammy docker image"
+      DISTRIB_CODENAME=jammy
     fi
     docker build -t pidtree-itest-base --build-arg OS_RELEASE=$DISTRIB_CODENAME .
     # Run the setup.sh install steps in the image so we don't hit timeouts

itest/itest_sourceipmap.sh

@@ -32,8 +32,8 @@ mkfifo $TOPLEVEL/$FIFONAME
 if [ -f /etc/lsb-release ]; then
     source /etc/lsb-release
 else
-    echo "WARNING: Could not source /etc/lsb-release, tentatively creating bionic docker image"
-    DISTRIB_CODENAME=bionic
+    echo "WARNING: Could not source /etc/lsb-release, tentatively creating jammy docker image"
+    DISTRIB_CODENAME=jammy
 fi
 docker build -t pidtree-itest-base --build-arg OS_RELEASE=$DISTRIB_CODENAME .
 docker build -t pidtree-itest itest