diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1ab7a1e..90e6b30e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [centos7, ubuntu1804, ubuntu2004, ubuntu2204, debian10, rockylinux9] + os: [centos7, ubuntu2004, ubuntu2204, debian10, rockylinux9] websession: [true, false] webprefix: ["", "/omero"] steps: diff --git a/.gitignore b/.gitignore index 17acdcdf..4abd28ee 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,6 @@ ansible/*.retry ansible/.DS_Store **/omeroweb-install-* **/centos7*/** -**/centos8*/** -**/ubuntu1804-*/** **/ubuntu2004-*/** **/ubuntu2204-*/** **/debian10-*/** diff --git a/.travis/install.sh b/.travis/install.sh index f989c9aa..ac219a9d 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -20,16 +20,6 @@ if [[ ${TRAVIS_OS_NAME:-} == 'linux' ]]; then sudo /tmp/$current_dir/omeroweb-install-debian10-ice${ICEVER} fi ;; - ubuntu1804) - if ${ANSIBLE:-false} ; then - ./test/docker-build-ansible.sh - else - current_dir=${PWD##*/} - mv `pwd` /tmp/ - chmod 755 -R /tmp/$current_dir - sudo /tmp/$current_dir/omeroweb-install-ubuntu1804-ice${ICEVER} - fi - ;; ubuntu2004) if ${ANSIBLE:-false} ; then ./test/docker-build-ansible.sh diff --git a/ansible/group_vars/ubuntu1804-ice3.6 b/ansible/group_vars/ubuntu1804-ice3.6 deleted file mode 100644 index 4f1e89ef..00000000 --- a/ansible/group_vars/ubuntu1804-ice3.6 +++ /dev/null @@ -1,51 +0,0 @@ -# INTERNAL CONFIG DON'T CHANGE - -path: "{{ playbook_dir }}" -clean: -os: ubuntu1804 -ice_version: "3.6" -python_version: "3.6" - -doc: False -doc_conf: - note: ".. walkthroughs are generated using ansible, see \n.. https://github.com/ome/omeroweb-install\n" - header: "OMERO.web installation on Ubuntu 18.04 and IcePy 3.6\n====================================================\n" - link_install: "Please first read :doc:`../../server-ubuntu1804-ice36`.\n" - os_full_name: Ubuntu1804 - prerequisites: "Installing prerequisites\n------------------------\n" - virtual_env: "Creating a virtual environment\n------------------------------\n" - web_install: "Installing OMERO.web\n--------------------\n" - webapps_install: "Installing OMERO.web apps\n-------------------------\n" - web_configuration: "Configuring OMERO.web\n---------------------\n" - gunicorn_configuration: "Configuring Gunicorn\n--------------------\n" - cors_configuration: "Setting up CORS\n---------------\n" - standalone_web: "Running OMERO.web\n-----------------\n" - nginx_configuration: "Configuring NGINX\n-----------------\n" - sel: "SELinux\n-------\n" - web_run: "Automatically running OMERO.web\n-------------------------------\n" - maintenance: "Maintaining OMERO.web\n---------------------\n" - troubleshoot: "Troubleshooting\n---------------\n" - gunicorn_configuration_advanced: "Configuring Gunicorn advanced options\n-------------------------------------\n" - sync_workers: "Experimental: Sync workers\n~~~~~~~~~~~~~~~~~~~~~~~~~~\n" - async_workers: "Experimental: Async workers\n~~~~~~~~~~~~~~~~~~~~~~~~~~~\n" - -default: - web_prefix: - web_port: 80 - web_server_name: localhost - -omero_user: "omero-web" -omero_user_home_dir: "/opt/omero/web" -virtualenv_path: "{{omero_user_home_dir}}/venv3" -omero_user_web_dir: "{{ omero_user_home_dir }}/omero-web" - -selinux: False -daemon: True - -# VARS - -web_session: - -web_prefix: -web_port: -web_server_name: diff --git a/ansible/hosts/ubuntu1804-ice3.6 b/ansible/hosts/ubuntu1804-ice3.6 deleted file mode 100644 index 66c3e969..00000000 --- a/ansible/hosts/ubuntu1804-ice3.6 +++ /dev/null @@ -1,5 +0,0 @@ -# Hosts can be part of multiple hostgroups, but note that vars will be -# read for all groups that the host is a member of - -[ubuntu1804-ice3.6] -localhost ansible_connection=local diff --git a/ansible/templates/ubuntu1804/daemon.sh.j2 b/ansible/templates/ubuntu1804/daemon.sh.j2 deleted file mode 100644 index c5811dd1..00000000 --- a/ansible/templates/ubuntu1804/daemon.sh.j2 +++ /dev/null @@ -1,23 +0,0 @@ -{% if doc %} -Copy the `init.d` file, then configure the service:: -{% else %} -#!/bin/bash - -set -e -u -x -{% endif %} - -{% if doc %} -cp omero-web-init.d /etc/init.d/omero-web -{% else %} -cp `dirname $0`/omero-web-init.d /etc/init.d/omero-web -{% endif %} -chmod a+x /etc/init.d/omero-web - -update-rc.d -f omero-web remove -update-rc.d -f omero-web defaults 98 02 - -{% if not doc %} -if [ ! "${container:-}" = docker ]; then - `dirname $0`/run -fi -{% endif %} diff --git a/ansible/templates/ubuntu1804/deps.sh.j2 b/ansible/templates/ubuntu1804/deps.sh.j2 deleted file mode 100644 index c7a7a459..00000000 --- a/ansible/templates/ubuntu1804/deps.sh.j2 +++ /dev/null @@ -1,18 +0,0 @@ -{% if doc %} -Install dependencies:: -{% else %} -#!/bin/bash - -set -e -u -x -echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/01norecommends \ - && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends - -{% endif %} - -apt-get update - -apt-get -y install unzip -apt-get -y install python3 -apt-get -y install python3-venv - -apt-get -y install nginx diff --git a/ansible/templates/ubuntu1804/deps_ice3.6.sh.j2 b/ansible/templates/ubuntu1804/deps_ice3.6.sh.j2 deleted file mode 100644 index b166d856..00000000 --- a/ansible/templates/ubuntu1804/deps_ice3.6.sh.j2 +++ /dev/null @@ -1,11 +0,0 @@ -{% if doc %} -Install ZeroC IcePy {{ ice_version }}:: - -{% else %} -#!/bin/bash - -set -e -u -x - -# ZeroC Ice 3.6 -{% endif %} -{{ virtualenv_path }}/bin/pip install https://github.com/ome/zeroc-ice-ubuntu1804/releases/download/0.2.0/zeroc_ice-3.6.5-cp36-cp36m-linux_x86_64.whl diff --git a/ansible/templates/ubuntu1804/deps_web_session.sh.j2 b/ansible/templates/ubuntu1804/deps_web_session.sh.j2 deleted file mode 100644 index f7a3ae69..00000000 --- a/ansible/templates/ubuntu1804/deps_web_session.sh.j2 +++ /dev/null @@ -1,17 +0,0 @@ -{% if doc %} -*Optional*: if you wish to use the Redis cache, install Redis:: -{% else %} -#!/bin/bash - -set -e -u -x -{% endif %} - -apt-get -y install redis-server - -{% if doc %} -service redis-server start -{% else %} -if [ ! "${container:-}" = docker ]; then - service redis-server restart -fi -{% endif %} diff --git a/ansible/templates/ubuntu1804/nginx.sh.j2 b/ansible/templates/ubuntu1804/nginx.sh.j2 deleted file mode 100644 index 570f79e9..00000000 --- a/ansible/templates/ubuntu1804/nginx.sh.j2 +++ /dev/null @@ -1,19 +0,0 @@ -{% if doc %} -Copy the generated configuration file into the NGINX configuration directory, disable the default configuration and start NGINX:: -{% else %} -#!/bin/bash - -set -e -u -x -{% endif %} - -sed -i.bak -re 's/( default_server.*)/; #\1/' /etc/nginx/nginx.conf -rm /etc/nginx/sites-enabled/default -cp {{ omero_user_web_dir }}/nginx.conf.tmp /etc/nginx/conf.d/omeroweb.conf - -{% if doc %} -service nginx start -{% else %} -if [ ! "${container:-}" = docker ]; then - service nginx restart -fi -{% endif %} diff --git a/ansible/templates/ubuntu1804/omero-web-init.d.j2 b/ansible/templates/ubuntu1804/omero-web-init.d.j2 deleted file mode 100644 index 46f1f921..00000000 --- a/ansible/templates/ubuntu1804/omero-web-init.d.j2 +++ /dev/null @@ -1,76 +0,0 @@ -{% if doc %} -Should you wish to run OMERO.web automatically, a `init.d` file could be created. See below an example file `omero-web-init.d`:: - -{% endif %} -#!/bin/bash -# -# /etc/init.d/omero-web -# Subsystem file for "omero" web -# -### BEGIN INIT INFO -# Provides: omero-web -# Required-Start: $local_fs $remote_fs $network $time omero postgresql -# Required-Stop: $local_fs $remote_fs $network $time omero postgresql -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OMERO.web -### END INIT INFO -# -### Redhat -# chkconfig: - 98 02 -# description: init file for OMERO.web -### - -RETVAL=0 -prog=omero-web - -# Read configuration variable file if it is present -[ -r /etc/default/$prog ] && . /etc/default/$prog - -OMERO_USER=${OMERO_USER:-{{ omero_user }}} -OMERO={{ virtualenv_path }}/bin/omero -OMERODIR={{ omero_user_web_dir }} -VENVDIR=${VENVDIR:-{{ virtualenv_path }}} - -start() { - echo -n $"Starting $prog:" - su - ${OMERO_USER} -c ". ${VENVDIR}/bin/activate;OMERODIR=${OMERODIR} ${OMERO} web start" &> /dev/null && echo -n ' OMERO.web' - sleep 5 - RETVAL=$? - [ "$RETVAL" = 0 ] - echo -} - -stop() { - echo -n $"Stopping $prog:" - su - ${OMERO_USER} -c ". ${VENVDIR}/bin/activate;OMERODIR=${OMERODIR} ${OMERO} web stop" &> /dev/null && echo -n ' OMERO.web' - RETVAL=$? - [ "$RETVAL" = 0 ] - echo -} - -status() { - echo -n $"Status $prog:" - su - ${OMERO_USER} -c ". ${VENVDIR}/bin/activate;OMERODIR=${OMERODIR} ${OMERO} web status" - RETVAL=$? -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - status) - status - ;; - *) - echo $"Usage: $0 {start|stop|restart|status}" - RETVAL=1 -esac -exit $RETVAL diff --git a/ansible/templates/ubuntu1804/run.sh.j2 b/ansible/templates/ubuntu1804/run.sh.j2 deleted file mode 100644 index 77d58c4f..00000000 --- a/ansible/templates/ubuntu1804/run.sh.j2 +++ /dev/null @@ -1,21 +0,0 @@ -{% if doc %} -Start up services:: -{% else %} -#!/bin/bash - -set -e -u -x -{% endif %} - -{% if web_session %} -service redis-server start -{% endif %} - -{% if not doc %} -#service crond start # Doesn't work in Docker -{% endif %} -cron -service nginx start -service omero-web restart -{% if not doc %} -exec bash -{% endif %} diff --git a/test/Dockerfile_ubuntu1804 b/test/Dockerfile_ubuntu1804 deleted file mode 100644 index c2340fa9..00000000 --- a/test/Dockerfile_ubuntu1804 +++ /dev/null @@ -1,34 +0,0 @@ -# Dockerfile for testing the OMERO Linux installation instructions -# Not intended for production use -FROM ubuntu:18.04 -MAINTAINER ome-devel@lists.openmicroscopy.org.uk - -# RUN update-locale LANG=C.UTF-8 -ENV LANG C.UTF-8 - -ADD ./omeroweb-install-test.zip /tmp -RUN apt-get update && apt-get -y install unzip cron -RUN unzip /tmp/omeroweb-install-test.zip -d /tmp - - -# This is so that scripts can detect whether they're in docker -RUN echo 'export container=docker' > /etc/profile.d/docker.sh - -ARG ICEVER=3.6 -ARG WEBPORT=80 -ARG WEBPREFIX -ARG WEBSESSION -ARG WEBSERVER_CONF -ARG WEBSERVER_NAME -ARG PYTHONVER - -RUN ICEVER=$ICEVER \ - WEBPORT=$WEBPORT WEBPREFIX=$WEBPREFIX WEBSESSION=$WEBSESSION \ - WEBSERVER_CONF=$WEBSERVER_CONF WEBSERVER_NAME=$WEBSERVER_NAME \ - PYTHONVER=$PYTHONVER \ - /tmp/omeroweb-install-test/omeroweb-install-ubuntu1804-ice${ICEVER} - -EXPOSE 22 80 - -ENV RUNPATH="/tmp/omeroweb-install-test/ubuntu1804-ice${ICEVER}/run" -CMD ["/bin/bash", "-c", "-e", "$RUNPATH"]