From b132dc40f62eea14ca06e98d0de0dd9e3f8ed2fe Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 22 Nov 2023 15:37:26 +0000 Subject: [PATCH] remove reference to 18.04 --- linux/autogenerate.sh | 2 +- linux/test/README.md | 25 +++++++++++-------------- linux/test/ubuntu1804/Dockerfile | 26 -------------------------- linux/test/ubuntu1804/run.sh | 12 ------------ 4 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 linux/test/ubuntu1804/Dockerfile delete mode 100644 linux/test/ubuntu1804/run.sh diff --git a/linux/autogenerate.sh b/linux/autogenerate.sh index d1f66c61..d03a22da 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=(centos7 debian10 ubuntu1804 ubuntu2004 ubuntu2204 rocky9) + values=(centos7 debian10 ubuntu2004 ubuntu2204 rocky9) for os in "${values[@]}"; do echo "${os}" generate ${os} diff --git a/linux/test/README.md b/linux/test/README.md index 8825d4dc..3d3d9277 100644 --- a/linux/test/README.md +++ b/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. diff --git a/linux/test/ubuntu1804/Dockerfile b/linux/test/ubuntu1804/Dockerfile deleted file mode 100644 index 7fd6693c..00000000 --- a/linux/test/ubuntu1804/Dockerfile +++ /dev/null @@ -1,26 +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 - -ARG OMEROVER=latest -ARG JAVAVER=openjdk11 -ARG ICEVER=ice36 -ARG PGVER=pg11 - -ENV TZ=Europe/London -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN echo 'APT::Install-Recommends 0;' > /etc/apt/apt.conf.d/01norecommends \ - && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends - -ADD omero-install-test.zip / -RUN apt-get update && apt-get -y install unzip && unzip omero-install-test.zip - -RUN cd omero-install-test && \ - bash install_ubuntu1804.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/ubuntu1804/run.sh b/linux/test/ubuntu1804/run.sh deleted file mode 100644 index 686f75b6..00000000 --- a/linux/test/ubuntu1804/run.sh +++ /dev/null @@ -1,12 +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