Migrate to Ubuntu 22.04

Also remove python2 for Ubuntu

README.md

@@ -68,7 +68,7 @@ To delete `network-analyser`, do `./network-analyser/clean-network-analyser.sh`.
 
 For Ubuntu operating system on the docker container:
 
-To delete `ubuntu:16.04` and `minimal-ubuntu:latest` docker images do `docker rmi ubuntu:16.04 minimal-ubuntu`.
+To delete `ubuntu:22.04` and `minimal-ubuntu:latest` docker images do `docker rmi ubuntu:22.04 minimal-ubuntu`.
 
 ## Possible improvements
 

build/krb5-ubuntu/Dockerfile.template

@@ -2,7 +2,7 @@
 #
 # usage: docker build -t minimal-ubuntu .
 
-FROM ubuntu:16.04
+FROM ubuntu:22.04
 
 # environment variables
 ENV DEBIAN_FRONTEND noninteractive
@@ -27,15 +27,13 @@ RUN apt install -y lsof
 RUN apt install -y curl wget
 
 # python
-RUN apt install -y python-dev
-RUN curl "https://bootstrap.pypa.io/pip/2.7/get-pip.py" -o /tmp/get-pip.py
-RUN python /tmp/get-pip.py
+RUN apt install -y python3-dev python3-pip
 
 # java
 RUN apt install -y openjdk-8-jdk
 # maven
-RUN apt install -y maven=3.3.9-3
+RUN apt install -y maven
 
 # supervisord
-RUN pip install supervisor==3.3.3
+RUN pip install supervisor
 RUN mkdir -p /var/log/supervisord/

build/nodes/kdc-server/supervisord.conf.template

@@ -21,7 +21,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
 
 [program:httpserver]
-command=python -m SimpleHTTPServer 8080
+command=python3 -m http.server 8080
 autostart=true
 autorestart=true
 

build/nodes/machine/supervisord.conf.template

@@ -21,6 +21,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
 
 [program:httpserver]
-command=python -m SimpleHTTPServer 8080
+command=python3 -m http.server 8080
 autostart=true
 autorestart=true

build/nodes/service/supervisord.conf.template

@@ -21,7 +21,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
 
 [program:httpserver]
-command=python -m SimpleHTTPServer 8080
+command=python3 -m http.server 8080
 autostart=true
 autorestart=true
 

test/os_test.sh

@@ -24,7 +24,7 @@ fi
 
 source /etc/os-release
 if [[ "$OS_CONTAINER" == "ubuntu" ]]; then
-  if [[ "${ID}" == "ubuntu" ]] && [[ "${VERSION_ID}" == "16.04" ]]; then
+  if [[ "${ID}" == "ubuntu" ]] && [[ "${VERSION_ID}" == "22.04" ]]; then
     echo "OS: ${ID}:${VERSION_ID}"
     exit 0
   fi