remove reference to 18.04

linux/autogenerate.sh

@@ -14,7 +14,7 @@ echo "${l}"
 
 #generate the walkthrough for all supported os
 function generate_all() {
-	values=(centos7 debian10 ubuntu1804 ubuntu2004 ubuntu2204 rocky9)
+	values=(centos7 debian10 ubuntu2004 ubuntu2204 rocky9)
 	for os in "${values[@]}"; do
   		echo "${os}"
   		 generate ${os}

linux/test/README.md

@@ -5,11 +5,8 @@ This directory contains Dockerfiles for testing the installation walkthroughs.
 
 For example:
 
-    ./docker-build.sh ubuntu1804
-    docker run --rm -it -p 8080:80 -p 4063:4063 -p 4064:4064 omero_install_test_ubuntu1804
-
-    ./docker-build.sh debian10
-    docker run --rm -it -p 8080:80 -p 4063:4063 -p 4064:4064 omero_install_test_debian10
+    ./docker-build.sh ubuntu2204
+    docker run --rm -it -p 8080:80 -p 4063:4063 -p 4064:4064 omero_install_test_ubuntu2204
 
 See `docker run --help` for more information on these and other options
 for running docker images.
@@ -54,7 +51,7 @@ To generate a specific walkthrough, run the following command
     OS=debian10 ALL=false bash autogenerate.sh
 
 The possible values are:
-centos7 (default), ubuntu1804, ubuntu2004, debian10
+centos7 (default), ubuntu2004, ubuntu2204, debian10, rocky9
 
 Configuring Java
 ----------------
@@ -64,7 +61,7 @@ It is possible to install other versions using the JAVAVER parameter.
 
 For example, to install openjdk11:
 
-JAVAVER=openjdk1.8 ./docker-build.sh ubuntu1804
+JAVAVER=openjdk1.8 ./docker-build.sh ubuntu2204
 
 The supported values are: 
 openjdk1.8, openjdk1.8-devel, openjdk11 (default), openjdk11-devel
@@ -73,34 +70,34 @@ If you do not want to install Java set JAVAVER to nojava.
 
 To add a new Java version, update the following files: 
 `step01_centos_java_deps.sh`, `step01_ubuntu_java_deps.sh`,
-`step01_ubuntu1804_java_deps.sh`, `step01_debian10_java_deps.sh`
+`step01_debian10_java_deps.sh`
 and update this README.md.
 
 Configuring Postgres
 --------------------
 
-By default, Postgres 11.0 is installed.
+By default, Postgres 14.0 is installed.
 It is possible to install other versions using the PGVER parameter.
 
 For example:
 
-    PGVER=pg10 ./docker-build.sh ubuntu1804
+    PGVER=pg15 ./docker-build.sh ubuntu2204
 
 It is not necessary to specify the version when running Ubuntu/Debian image.
 
 For example:
 
-    docker run --rm -it -p 8080:80 -p 4063:4063 -p 4064:4064 omero_install_test_ubuntu1804
+    docker run --rm -it -p 8080:80 -p 4063:4063 -p 4064:4064 omero_install_test_ubuntu2204
 
 
 The supported values are: 
-pg11 (default), pg12 (ubuntu 20.04 only), pg13, pg14
+pg13, pg14, pg15
 
 If you do not want to install Postgres set PGVER to nopg.
 
 To add a new Postgres version, update the following files: 
 `step01_centos7_pg_deps.sh`,
-`step01_ubuntu1804_pg_deps.sh`, `step01_ubuntu2004_pg_deps.sh`,
+`step01_ubuntu2004_pg_deps.sh`, `step01_ubuntu2204_pg_deps.sh`,
 `step01_debian10_pg_deps.sh` and update this README.md.
 
 Configuring Ice
@@ -118,7 +115,7 @@ ice36-devel (CentOS 7 only), ice36
 
 To add a new Ice version, update the following files:
 `step01_centos7_ice_venv_deps.sh`, `step01_ubuntu_ice_venv_deps.sh`,
-step01_ubuntu1804_ice_venv_deps.sh`, `step01_ubuntu2004_ice_venv_deps.sh`
+step01_ubuntu2004_ice_venv_deps.sh`, `step01_ubuntu2204_ice_venv_deps.sh`
 `step01_debian10_ice_venv_deps.sh`
 and update this README.md.