diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fac9b2ab..630b7c33 100644 --- 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 index dcd21e15..6883c1e2 100644 --- 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 index 21f39b1d..cdd5562c 100755 --- 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 deleted file mode 100644 index e72f1585..00000000 --- a/linux/install_debian10.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -e -u -x - -OMEROVER=${OMEROVER:-latest} -PGVER=${PGVER:-pg11} -ICEVER=${ICEVER:-ice36} - -. settings.env - -bash -eux step01_ubuntu_init.sh - -# install java -bash -eux step01_debian10_java_deps.sh - -bash -eux step01_debian10_deps.sh - -# install ice -bash -eux step01_debian10_ice_deps.sh - -if [ "$ICEVER" = "ice36" ]; then - cat omero-ice36.env >> /etc/profile -fi - -# install Postgres -bash -eux step01_debian10_pg_deps.sh - -bash -eux step02_all_setup.sh - -if [[ "$PGVER" =~ ^(pg11|pg12|pg13|pg14)$ ]]; then - bash -eux step03_all_postgres.sh -fi -cp settings.env step04_all_omero.sh setup_omero_db.sh ~omero-server - -bash -x step01_debian10_ice_venv.sh -bash -eux step04_all_omero_install.sh - -su - omero-server -c "OMEROVER=$OMEROVER ICEVER=$ICEVER bash -x step04_all_omero.sh" -su - omero-server -c "bash setup_omero_db.sh" - -#If you don't want to use the init.d scripts you can start OMERO manually: -#su - omero-server -c ". /home/omero-server/settings.env omero admin start" - -bash -eux step06_ubuntu_daemon.sh - -bash -eux step07_all_perms.sh - -#service omero start diff --git a/linux/setup_centos_selinux.sh b/linux/setup_centos_selinux.sh deleted file mode 100644 index e5e449df..00000000 --- a/linux/setup_centos_selinux.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ $(getenforce) != Disabled ]; then - yum -y install policycoreutils-python - setsebool -P httpd_read_user_content 1 - setsebool -P httpd_enable_homedirs 1 - semanage port -a -t http_port_t -p tcp 4080 -fi diff --git a/linux/step01_debian10_deps.sh b/linux/step01_debian10_deps.sh deleted file mode 100644 index aa29c419..00000000 --- a/linux/step01_debian10_deps.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -apt-get -y install\ - python3 \ - python3-venv diff --git a/linux/step01_debian10_ice_deps.sh b/linux/step01_debian10_ice_deps.sh deleted file mode 100644 index 480405d7..00000000 --- a/linux/step01_debian10_ice_deps.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -ICEVER=${ICEVER:-ice36} - - -# Ice installation -if [ "$ICEVER" = "ice36" ]; then - #start-recommended - apt-get update && \ - apt-get install -y -q \ - build-essential \ - db5.3-util \ - libbz2-dev \ - libdb++-dev \ - libdb-dev \ - libexpat-dev \ - libmcpp-dev \ - libssl-dev \ - mcpp \ - zlib1g-dev - - cd /tmp - wget -q https://github.com/ome/zeroc-ice-debian10/releases/download/0.1.0/ice-3.6.5-0.1.0-debian10-amd64.tar.gz - tar xf ice-3.6.5-0.1.0-debian10-amd64.tar.gz - mv ice-3.6.5-0.1.0 ice-3.6.5 - mv ice-3.6.5 /opt - echo /opt/ice-3.6.5/lib/x86_64-linux-gnu > /etc/ld.so.conf.d/ice-x86_64.conf - ldconfig - #end-recommended -fi diff --git a/linux/step01_debian10_ice_venv.sh b/linux/step01_debian10_ice_venv.sh deleted file mode 100644 index 6423764e..00000000 --- a/linux/step01_debian10_ice_venv.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -x - -VENV_SERVER=${VENV_SERVER:-/opt/omero/server/venv3} -#start-ice-py -# Create a virtual env -python3 -mvenv $VENV_SERVER - -# Upgrade pip -$VENV_SERVER/bin/pip install --upgrade pip - -# Install the Ice Python binding -$VENV_SERVER/bin/pip install https://github.com/ome/zeroc-ice-debian10/releases/download/0.1.0/zeroc_ice-3.6.5-cp37-cp37m-linux_x86_64.whl - -# Install server dependencies -$VENV_SERVER/bin/pip install omero-server -#end-ice-py diff --git a/linux/step01_debian10_java_deps.sh b/linux/step01_debian10_java_deps.sh deleted file mode 100644 index 3bd60e28..00000000 --- a/linux/step01_debian10_java_deps.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -JAVAVER=${JAVAVER:-openjdk11} - -# install java -if [ "$JAVAVER" = "openjdk11" ]; then - #start-recommended - apt-get -y install default-jre - #end-recommended -elif [ "$JAVAVER" = "openjdk11-devel" ]; then - apt-get -y install default-jdk -fi diff --git a/linux/step01_debian10_pg_deps.sh b/linux/step01_debian10_pg_deps.sh deleted file mode 100644 index 96aa1f5a..00000000 --- a/linux/step01_debian10_pg_deps.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -PGVER=${PGVER:-pg11} - -if [ "$PGVER" = "pg11" ]; then - #start-recommended - apt-get install -y postgresql-11 - service postgresql start - #end-recommended -elif [ "$PGVER" = "pg12" ]; then - apt-get -y install gnupg2 - echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - apt-get update - apt-get install -y postgresql-12 - service postgresql start -elif [ "$PGVER" = "pg13" ]; then - apt-get -y install gnupg2 - echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - apt-get update - apt-get install -y postgresql-13 - service postgresql start -elif [ "$PGVER" = "pg14" ]; then - apt-get -y install gnupg2 - echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list - wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - - apt-get update - apt-get install -y postgresql-14 - service postgresql start -fi diff --git a/linux/step04_centos7_ciphers.sh b/linux/step04_centos7_ciphers.sh deleted file mode 100644 index 19c474b3..00000000 --- a/linux/step04_centos7_ciphers.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -x - -. `dirname $0`/settings.env - -#start-diffie-hellman -omero config set omero.glacier2.IceSSL.Ciphers=HIGH:!DH -#end-diffie-hellman \ No newline at end of file diff --git a/linux/step06_centos7_daemon.sh b/linux/step06_centos7_daemon.sh deleted file mode 100644 index 1bc95772..00000000 --- a/linux/step06_centos7_daemon.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -#start-recommended -cp omero-server-systemd.service /etc/systemd/system/omero-server.service -if [ ! -f /.dockerenv ]; then - systemctl daemon-reload -fi -systemctl enable omero-server.service -#end-recommended diff --git a/linux/test/README.md b/linux/test/README.md index 6f7a2f09..c745f03e 100644 --- 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 deleted file mode 100644 index 226ba7f9..00000000 --- a/linux/test/debian10/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Dockerfile for testing the OMERO Linux installation instructions -# Not intended for production use -FROM debian:buster -MAINTAINER ome-devel@lists.openmicroscopy.org.uk - -ARG OMEROVER=latest -ARG JAVAVER=openjdk11 -ARG ICEVER=ice36 -ARG PGVER=pg10 - -RUN echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/01norecommends \ - && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends - -RUN apt-get update && apt-get -y install locales -RUN update-locale LANG=C.UTF-8 - -ADD omero-install-test.zip / -RUN apt-get -y install unzip && unzip omero-install-test.zip - -RUN cd omero-install-test && \ - bash install_debian10.sh && \ - bash docker_shutdown_ubuntu.sh -ADD run.sh /home/omero-server/run.sh - -EXPOSE 80 4063 4064 -CMD ["/bin/bash", "-e", "/home/omero-server/run.sh"] diff --git a/linux/test/debian10/run.sh b/linux/test/debian10/run.sh deleted file mode 100644 index cfd2795c..00000000 --- a/linux/test/debian10/run.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -service postgresql start -#service crond start # Doesn't work in Docker -cron -service omero-server start -if [ -t 1 ] ; then - exec bash -else - exec tail -F /opt/omero/server/OMERO.server/var/log/* -fi