Skip to content

Commit

Permalink
Merge pull request #282 from jburel/remove_1804
Browse files Browse the repository at this point in the history
Remove 1804
  • Loading branch information
jburel authored Nov 23, 2023
2 parents 9a5349d + b132dc4 commit 3bc5c8f
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 217 deletions.
2 changes: 1 addition & 1 deletion linux/autogenerate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
48 changes: 0 additions & 48 deletions linux/install_ubuntu1804.sh

This file was deleted.

4 changes: 2 additions & 2 deletions linux/install_ubuntu2004.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ ICEVER=${ICEVER:-ice36}
bash -eux step01_ubuntu_init.sh

# install java
bash -eux step01_ubuntu1804_java_deps.sh
bash -eux step01_ubuntu_java_deps.sh

bash -eux step01_ubuntu1804_deps.sh
bash -eux step01_ubuntu_deps.sh

# install ice
bash -eux step01_ubuntu2004_ice_deps.sh
Expand Down
4 changes: 2 additions & 2 deletions linux/install_ubuntu2204.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ if [ ! -f /.dockerenv ]; then
fi

# install java
bash -eux step01_ubuntu1804_java_deps.sh
bash -eux step01_ubuntu_java_deps.sh

bash -eux step01_ubuntu1804_deps.sh
bash -eux step01_ubuntu_deps.sh

# install ice
bash -eux step01_ubuntu2204_ice_deps.sh
Expand Down
31 changes: 0 additions & 31 deletions linux/step01_ubuntu1804_ice_deps.sh

This file was deleted.

18 changes: 0 additions & 18 deletions linux/step01_ubuntu1804_ice_venv.sh

This file was deleted.

19 changes: 0 additions & 19 deletions linux/step01_ubuntu1804_java_deps.sh

This file was deleted.

35 changes: 0 additions & 35 deletions linux/step01_ubuntu1804_pg_deps.sh

This file was deleted.

File renamed without changes.
10 changes: 1 addition & 9 deletions linux/step01_ubuntu_java_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,17 @@
JAVAVER=${JAVAVER:-openjdk11}
# install java
if [ "$JAVAVER" = "openjdk1.8" ]; then
apt-get -y install software-properties-common
add-apt-repository -y ppa:openjdk-r/ppa
apt-get update
apt-get -y install openjdk-8-jre
elif [ "$JAVAVER" = "openjdk1.8-devel" ]; then
apt-get -y install software-properties-common
add-apt-repository -y ppa:openjdk-r/ppa
apt-get update
apt-get -y install openjdk-8-jdk
elif [ "$JAVAVER" = "openjdk11-devel" ]; then
apt-get -y install software-properties-common
add-apt-repository ppa:openjdk-r/ppa
apt-get update -q
apt-get install -y openjdk-11-jdk
elif [ "$JAVAVER" = "openjdk11" ]; then
#start-recommended
apt-get -y install software-properties-common
add-apt-repository ppa:openjdk-r/ppa
apt-get update -q
apt-get install -y openjdk-11-jre
apt-get install -y openjdk-11-jdk
#end-recommended
fi
25 changes: 11 additions & 14 deletions linux/test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
----------------
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.

Expand Down
26 changes: 0 additions & 26 deletions linux/test/ubuntu1804/Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions linux/test/ubuntu1804/run.sh

This file was deleted.

0 comments on commit 3bc5c8f

Please sign in to comment.