Merge pull request #289 from jburel/debian10

Debian10
ome · Jul 10, 2024 · 301c6ea · 301c6ea
2 parents c728a3e + 5448c9b
commit 301c6ea
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 223 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,15 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [rockylinux9, debian10, ubuntu2204]
+        os: [rockylinux9, ubuntu2204]
         pg: [pg13, pg14, pg15, pg16]
         exclude:
           - os: ubuntu2204
             pg: pg13
-          - os: debian10
-            pg: pg15
-          - os: debian10
-            pg: pg16
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/linux/README.md b/linux/README.md
@@ -2,13 +2,12 @@ Example OMERO Linux install scripts
 ===================================
 
 This directory contains examples of installing OMERO on clean
-Ubuntu 22.04, Ubuntu 20.04, Debian 10, Rocky Linux 9 64-bit systems, see
+Ubuntu 22.04, Ubuntu 20.04, Rocky Linux 9 64-bit systems, see
 https://docs.openmicroscopy.org/latest/omero/sysadmins/unix/server-installation.html
 
 Copy the files from this directory, then run one of the install scripts,
 
-	bash install_ubuntu2204.sh
-    bash install_debian10.sh
+    bash install_ubuntu2204.sh
     bash install_ubuntu2004.sh
     bash install_rocky9.sh
 

diff --git a/linux/autogenerate.sh b/linux/autogenerate.sh
@@ -14,7 +14,7 @@ echo "${l}"
 
 #generate the walkthrough for all supported os
 function generate_all() {
-	values=(debian10 ubuntu2004 ubuntu2204 rocky9)
+	values=(ubuntu2004 ubuntu2204 rocky9)
 	for os in "${values[@]}"; do
   		echo "${os}"
   		 generate ${os}
@@ -34,7 +34,7 @@ set -e -u -x
 EOF
 
 N=$OS
-if [[ $OS =~ "debian" ]] || [[ $OS =~ "ubuntu" ]] ; then
+if [[ $OS =~ "ubuntu" ]] ; then
 	N="ubuntu"
 elif [[ $OS =~ "rocky" ]]  ; then
     N="rocky"

diff --git a/linux/install_debian10.sh b/linux/install_debian10.sh
diff --git a/linux/setup_centos_selinux.sh b/linux/setup_centos_selinux.sh
diff --git a/linux/step01_debian10_deps.sh b/linux/step01_debian10_deps.sh
diff --git a/linux/step01_debian10_ice_deps.sh b/linux/step01_debian10_ice_deps.sh
diff --git a/linux/step01_debian10_ice_venv.sh b/linux/step01_debian10_ice_venv.sh
diff --git a/linux/step01_debian10_java_deps.sh b/linux/step01_debian10_java_deps.sh
diff --git a/linux/step01_debian10_pg_deps.sh b/linux/step01_debian10_pg_deps.sh
diff --git a/linux/step04_centos7_ciphers.sh b/linux/step04_centos7_ciphers.sh
diff --git a/linux/step06_centos7_daemon.sh b/linux/step06_centos7_daemon.sh
diff --git a/linux/test/README.md b/linux/test/README.md
@@ -48,10 +48,10 @@ To generate all the walkthroughs, run the following command
 
 To generate a specific walkthrough, run the following command
 
-    OS=debian10 ALL=false bash autogenerate.sh
+    OS=ubuntu2204 ALL=false bash autogenerate.sh
 
 The possible values are:
-ubuntu2004, ubuntu2204, debian10, rocky9 (default)
+ubuntu2004, ubuntu2204, rocky9 (default)
 
 Configuring Java
 ----------------
@@ -69,8 +69,7 @@ openjdk1.8, openjdk1.8-devel, openjdk11 (default), openjdk11-devel
 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_debian10_java_deps.sh`
+`step01_ubuntu_java_deps.sh`
 and update this README.md.
 
 Configuring Postgres
@@ -83,7 +82,7 @@ For example:
 
     PGVER=pg15 ./docker-build.sh rocky9
 
-It is not necessary to specify the version when running Ubuntu/Debian image.
+It is not necessary to specify the version when running Ubuntu image.
 
 For example:
 
@@ -97,8 +96,8 @@ If you do not want to install Postgres set PGVER to nopg.
 
 To add a new Postgres version, update the following files:
 `step01_rocky9_deps.sh`,
-`step01_ubuntu2004_pg_deps.sh`, `step01_ubuntu2204_pg_deps.sh`,
-`step01_debian10_pg_deps.sh` and update this README.md.
+`step01_ubuntu2004_pg_deps.sh`, `step01_ubuntu2204_pg_deps.sh`
+and update this README.md.
 
 Configuring Ice
 ---------------

diff --git a/linux/test/debian10/Dockerfile b/linux/test/debian10/Dockerfile
diff --git a/linux/test/debian10/run.sh b/linux/test/debian10/run.sh