From 38b159afce310f8923cbc1655cffd7094f2b4498 Mon Sep 17 00:00:00 2001 From: Dominik Lindner Date: Tue, 18 Jul 2023 15:40:03 +0100 Subject: [PATCH 01/15] Add rocky linux 9 --- linux/install_rocky9.sh | 42 +++++++++++++++++++++++++++++++ linux/step01_rocky9_ice_deps.sh | 12 +++++++++ linux/step01_rocky9_ice_venv.sh | 18 +++++++++++++ linux/step01_rocky9_pg_deps.sh | 9 +++++++ linux/step04_all_omero_install.sh | 19 ++++++-------- 5 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 linux/install_rocky9.sh create mode 100644 linux/step01_rocky9_ice_deps.sh create mode 100644 linux/step01_rocky9_ice_venv.sh create mode 100644 linux/step01_rocky9_pg_deps.sh diff --git a/linux/install_rocky9.sh b/linux/install_rocky9.sh new file mode 100644 index 00000000..e8b9e84e --- /dev/null +++ b/linux/install_rocky9.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -e -u -x + +OMEROVER=${OMEROVER:-latest} + +. `dirname $0`/settings.env + +bash -eux step01_centos7_init.sh + +# install java +bash -eux step01_centos_java_deps.sh + +# install ice +bash -eux step01_rocky9_ice_deps.sh + +# install Postgres +bash -eux step01_rocky9_pg_deps.sh + +bash -eux step02_all_setup.sh + +bash -eux step03_all_postgres.sh + +bash -eux step01_rocky9_ice_venv.sh + +# Those steps are valid if an omero-server user exists +# This might not be the case when used in the context of devspace +if [ "$(getent passwd omero-server)" ]; then + cp settings.env step04_all_omero.sh setup_omero_db.sh ~omero-server + + OMEROVER=$OMEROVER bash -eux step04_all_omero_install.sh + + su - omero-server -c " bash -eux step04_all_omero.sh" + + su - omero-server -c "bash setup_omero_db.sh" +fi + + +#If you don't want to use the systemd scripts you can start OMERO manually: +#su - omero-server -c ". /home/omero-server/settings.env omero admin start" + +bash -eux step06_centos7_daemon.sh diff --git a/linux/step01_rocky9_ice_deps.sh b/linux/step01_rocky9_ice_deps.sh new file mode 100644 index 00000000..5cec3327 --- /dev/null +++ b/linux/step01_rocky9_ice_deps.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +dnf config-manager --set-enabled crb +yum -y install bzip2 expat openssl libdb-cxx + +cd /tmp +wget https://github.com/sbesson/zeroc-ice-rockylinux9-x86_64/releases/download/202307018/Ice-3.6.5-rockylinux9-x86_64.tar.gz +tar xf Ice-3.6.5-rockylinux9-x86_64.tar.gz +mv Ice-3.6.5 ice-3.6.5 +mv ice-3.6.5 /opt +echo /opt/ice-3.6.5/lib64 > /etc/ld.so.conf.d/ice-x86_64.conf +ldconfig diff --git a/linux/step01_rocky9_ice_venv.sh b/linux/step01_rocky9_ice_venv.sh new file mode 100644 index 00000000..67688b81 --- /dev/null +++ b/linux/step01_rocky9_ice_venv.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e -u -x + +VENV_SERVER=${VENV_SERVER:-/opt/omero/server/venv3} +#start-ice-py +# Create a virtual env +python -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/sbesson/zeroc-ice-py-rockylinux9-x86_64/releases/download/20230719/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl + +# Install server dependencies +$VENV_SERVER/bin/pip install omero-server +#end-ice-py diff --git a/linux/step01_rocky9_pg_deps.sh b/linux/step01_rocky9_pg_deps.sh new file mode 100644 index 00000000..aa9fc58a --- /dev/null +++ b/linux/step01_rocky9_pg_deps.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +yum -y install postgresql-server postgresql +/usr/bin/postgresql-setup --initdb + +sed -i 's/ ident/ trust/g' /var/lib/pgsql/data/pg_hba.conf + +systemctl enable postgresql +systemctl start postgresql diff --git a/linux/step04_all_omero_install.sh b/linux/step04_all_omero_install.sh index 17cf43ea..f635b13a 100644 --- a/linux/step04_all_omero_install.sh +++ b/linux/step04_all_omero_install.sh @@ -1,6 +1,5 @@ #!/bin/bash OMEROVER=${OMEROVER:-latest} -ICEVER=${ICEVER:-ice36} set -eux @@ -8,16 +7,14 @@ set -eux #start-install -if [ "$ICEVER" = "ice36" ] || [ "$ICEVER" = "ice36-devel" ]; then - if [ $OMEROVER == "latest" ]; then - #start-release-ice36 - cd /opt/omero/server - SERVER=https://downloads.openmicroscopy.org/omero/5.6/server-ice36.zip - wget -q $SERVER -O OMERO.server-ice36.zip - unzip -q OMERO.server* - #end-release-ice36 - rm OMERO.server-ice36.zip - fi +if [ $OMEROVER == "latest" ]; then + #start-release-ice36 + cd /opt/omero/server + SERVER=https://downloads.openmicroscopy.org/omero/5.6/server-ice36.zip + wget -q $SERVER -O OMERO.server-ice36.zip + unzip -q OMERO.server* + #end-release-ice36 + rm OMERO.server-ice36.zip fi #start-link From efb6a1892bd2bf136a86b1f1329ccbbc049b33f5 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 29 Aug 2023 22:44:58 +0100 Subject: [PATCH 02/15] test rocky9 --- .github/workflows/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a31599ad..e9a4f1c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,14 +12,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [debian10, ubuntu1804, ubuntu2004, ubuntu2204] + os: [rockylinux9, debian10, ubuntu1804, ubuntu2004, ubuntu2204] pg: [pg13, pg14] exclude: - os: ubuntu2204 pg: pg13 steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Install shunit2 run: sudo apt-get install -y shunit2 - name: Build walkthroughs @@ -29,8 +29,7 @@ jobs: - name: Build docker image run: | cd linux/test - PGVER=$PGVER ./docker-build.sh $ENV + ./docker-build.sh $ENV ./test_services.sh env: ENV: ${{ matrix.os }} - PGVER: ${{ matrix.pg }} From e37e2a1847f631f6f2f01094fcb76df18afb1ca2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 23 Aug 2023 10:46:04 +0100 Subject: [PATCH 03/15] add dockerfile --- linux/test/rockylinux9/Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 linux/test/rockylinux9/Dockerfile diff --git a/linux/test/rockylinux9/Dockerfile b/linux/test/rockylinux9/Dockerfile new file mode 100644 index 00000000..ec5eed3b --- /dev/null +++ b/linux/test/rockylinux9/Dockerfile @@ -0,0 +1,18 @@ +# Dockerfile for testing the OMERO Linux installation instructions +# Not intended for production use +FROM rockylinux:9 +MAINTAINER ome-devel@lists.openmicroscopy.org.uk + +ARG OMEROVER=latest +ARG JAVAVER=openjdk11 +ARG ICEVER=ice36 +ARG PGVER=pg14 + + +ADD omero-install-test.zip / +RUN dnf -y install unzip && unzip omero-install-test.zip + +RUN cd omero-install-test && \ + bash install_rocky9.sh + +EXPOSE 80 4063 4064 From e377f95f37e72c7a11d429ef723f7503c1c9da30 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:04:16 +0100 Subject: [PATCH 04/15] export ICE_HOME --- linux/settings.env | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linux/settings.env b/linux/settings.env index 2e0cb5b3..40d22de9 100644 --- a/linux/settings.env +++ b/linux/settings.env @@ -17,4 +17,6 @@ export OMERODIR=/opt/omero/server/OMERO.server # Location of the virtual environment for omero-py VENV_SERVER=/opt/omero/server/venv3 -export PATH=$VENV_SERVER/bin:$PATH +export ICE_HOME=/opt/ice-3.6.5 + +export PATH=$ICE_HOME/bin:$VENV_SERVER/bin:$PATH From 478ae4265e0a855281a65f73965fc0bb85cbc1c9 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:04:53 +0100 Subject: [PATCH 05/15] simplify setup --- linux/step01_rocky9_ice_deps.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/linux/step01_rocky9_ice_deps.sh b/linux/step01_rocky9_ice_deps.sh index 5cec3327..bd07c54a 100644 --- a/linux/step01_rocky9_ice_deps.sh +++ b/linux/step01_rocky9_ice_deps.sh @@ -1,12 +1,11 @@ #!/bin/bash dnf config-manager --set-enabled crb -yum -y install bzip2 expat openssl libdb-cxx +yum -y install bzip2 expat libdb-cxx cd /tmp wget https://github.com/sbesson/zeroc-ice-rockylinux9-x86_64/releases/download/202307018/Ice-3.6.5-rockylinux9-x86_64.tar.gz tar xf Ice-3.6.5-rockylinux9-x86_64.tar.gz -mv Ice-3.6.5 ice-3.6.5 -mv ice-3.6.5 /opt +mv Ice-3.6.5 /opt/ice-3.6.5 echo /opt/ice-3.6.5/lib64 > /etc/ld.so.conf.d/ice-x86_64.conf ldconfig From 3418110ff24ee422b2b1ee107862bf4cc6df8156 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:05:19 +0100 Subject: [PATCH 06/15] use python3 --- linux/step01_rocky9_ice_venv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/step01_rocky9_ice_venv.sh b/linux/step01_rocky9_ice_venv.sh index 67688b81..3af259fd 100644 --- a/linux/step01_rocky9_ice_venv.sh +++ b/linux/step01_rocky9_ice_venv.sh @@ -5,7 +5,7 @@ set -e -u -x VENV_SERVER=${VENV_SERVER:-/opt/omero/server/venv3} #start-ice-py # Create a virtual env -python -mvenv $VENV_SERVER +python3 -mvenv $VENV_SERVER # Upgrade pip $VENV_SERVER/bin/pip install --upgrade pip From 8399b85cc429668fdae9a9e9eda1416cf308efd7 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:06:01 +0100 Subject: [PATCH 07/15] review installation docker vs non docker --- linux/step01_rocky9_pg_deps.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/linux/step01_rocky9_pg_deps.sh b/linux/step01_rocky9_pg_deps.sh index aa9fc58a..f871c592 100644 --- a/linux/step01_rocky9_pg_deps.sh +++ b/linux/step01_rocky9_pg_deps.sh @@ -1,9 +1,22 @@ #!/bin/bash +# pg 13 is installed by default yum -y install postgresql-server postgresql -/usr/bin/postgresql-setup --initdb -sed -i 's/ ident/ trust/g' /var/lib/pgsql/data/pg_hba.conf +ls -all / +if [ -f /.dockerenv ]; then + su - postgres -c "/usr/bin/initdb -D /var/lib/pgsql/data --encoding=UTF8" + echo "listen_addresses='*'" >> /var/lib/pgsql/data/postgresql.conf +else + PGSETUP_INITDB_OPTIONS=--encoding=UTF8 /usr/bin/postgresql-setup --initdb +fi +sed -i.bak -re 's/^(host.*)ident/\1md5/' /var/lib/pgsql/data/pg_hba.conf + +if [ -f /.dockerenv ]; then + su - postgres -c "/usr/bin/pg_ctl start -D /var/lib/pgsql/data -w" +else + systemctl start postgresql +fi + systemctl enable postgresql -systemctl enable postgresql -systemctl start postgresql +sed -i 's/ ident/ trust/g' /var/lib/pgsql/data/pg_hba.conf From 940b22b58f58be45bb2c3e4164355ed27355f597 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:06:52 +0100 Subject: [PATCH 08/15] review docker case --- linux/step06_centos7_daemon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/step06_centos7_daemon.sh b/linux/step06_centos7_daemon.sh index 08e88c65..1bc95772 100644 --- a/linux/step06_centos7_daemon.sh +++ b/linux/step06_centos7_daemon.sh @@ -2,7 +2,7 @@ #start-recommended cp omero-server-systemd.service /etc/systemd/system/omero-server.service -if [ ! "${container:-}" = docker ]; then +if [ ! -f /.dockerenv ]; then systemctl daemon-reload fi systemctl enable omero-server.service From 22ce5ea92d030b9320e7bb7a858b1f5190825292 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:08:55 +0100 Subject: [PATCH 09/15] review file --- linux/test/rockylinux9/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/test/rockylinux9/Dockerfile b/linux/test/rockylinux9/Dockerfile index ec5eed3b..178bcd62 100644 --- a/linux/test/rockylinux9/Dockerfile +++ b/linux/test/rockylinux9/Dockerfile @@ -6,9 +6,9 @@ MAINTAINER ome-devel@lists.openmicroscopy.org.uk ARG OMEROVER=latest ARG JAVAVER=openjdk11 ARG ICEVER=ice36 -ARG PGVER=pg14 - +ARG PGVER=pg13 +RUN touch /.dockerenv ADD omero-install-test.zip / RUN dnf -y install unzip && unzip omero-install-test.zip From 776cfda5d41e943b9569b74d54bd011833309c89 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:09:41 +0100 Subject: [PATCH 10/15] review file --- linux/install_rocky9.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux/install_rocky9.sh b/linux/install_rocky9.sh index e8b9e84e..5fc76d71 100644 --- a/linux/install_rocky9.sh +++ b/linux/install_rocky9.sh @@ -8,6 +8,8 @@ OMEROVER=${OMEROVER:-latest} bash -eux step01_centos7_init.sh +bash -eux step01_centos7_deps.sh + # install java bash -eux step01_centos_java_deps.sh From f0478611fbb75d841c9d246492234346f710a318 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Mon, 28 Aug 2023 14:14:48 +0100 Subject: [PATCH 11/15] pass env --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e9a4f1c9..cb9f3fc6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,6 @@ jobs: run: | cd linux/test ./docker-build.sh $ENV - ./test_services.sh + ./test_services.sh $ENV env: ENV: ${{ matrix.os }} From eb6c81d959480c8e38ff3736929d254304b868d2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 29 Aug 2023 13:13:18 +0100 Subject: [PATCH 12/15] do not use service --- linux/test/test_services.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/linux/test/test_services.sh b/linux/test/test_services.sh index 9ca03c22..e37e5ee7 100755 --- a/linux/test/test_services.sh +++ b/linux/test/test_services.sh @@ -39,9 +39,6 @@ docker exec $CNAME /bin/bash -c 'd=10; \ done; \ echo "Entry found"; exit' -#check OMERO.server service status -docker exec $CNAME /bin/bash -c "service omero-server status -l --no-pager" - docker exec $CNAME /bin/bash -c "su - omero-server -c \". ${SETTINGS} && omero admin diagnostics\"" # Log in to OMERO.server From 1fa0a00cad77bb77af91f9fdab5e2933c697c23f Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 29 Aug 2023 13:13:37 +0100 Subject: [PATCH 13/15] use run file --- linux/test/rockylinux9/Dockerfile | 3 +++ linux/test/rockylinux9/run.sh | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 linux/test/rockylinux9/run.sh diff --git a/linux/test/rockylinux9/Dockerfile b/linux/test/rockylinux9/Dockerfile index 178bcd62..83d27f22 100644 --- a/linux/test/rockylinux9/Dockerfile +++ b/linux/test/rockylinux9/Dockerfile @@ -15,4 +15,7 @@ RUN dnf -y install unzip && unzip omero-install-test.zip RUN cd omero-install-test && \ bash install_rocky9.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/rockylinux9/run.sh b/linux/test/rockylinux9/run.sh new file mode 100644 index 00000000..8e105b18 --- /dev/null +++ b/linux/test/rockylinux9/run.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +su - postgres -c "/usr/bin/pg_ctl start -D /var/lib/pgsql/data -w" + +#service crond start # Doesn't work in Docker +su - omero-server -c ". /home/omero-server/settings.env && omero admin start" +if [ -t 1 ] ; then + exec bash +else + exec tail -F /opt/omero/server/OMERO.server/var/log/* +fi From e3f192a3079535082aca7df3275371fb08982a08 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 29 Aug 2023 22:46:21 +0100 Subject: [PATCH 14/15] adjust to generate doc --- linux/autogenerate.sh | 28 +++++++++++++++++++--------- linux/step01_rocky9_ice_deps.sh | 2 ++ linux/step01_rocky9_pg_deps.sh | 10 ++++++++-- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/linux/autogenerate.sh b/linux/autogenerate.sh index 14ec3e86..d4fe6182 100755 --- a/linux/autogenerate.sh +++ b/linux/autogenerate.sh @@ -7,14 +7,14 @@ dir=`dirname $0` remove_docker_workaround () { l="$(echo -e "${@}" | sed -e 's/^[[:space:]]*//')" l="$(echo -e "${l}" | sed -e 's/^if.*!.*then//' )" -l="$(echo -e "${l}" | sed -e '/^if.*container.*then/,/else/d' )" +l="$(echo -e "${l}" | sed -e '/^if.*docker.*then/,/else/d' )" l="$(echo -e "${l}" | sed -e 's/^fi//')" echo "${l}" } #generate the walkthrough for all supported os function generate_all() { - values=(centos7 debian10 ubuntu1804 ubuntu2004 ubuntu2204) + values=(centos7 debian10 ubuntu1804 ubuntu2004 ubuntu2204 rocky9) for os in "${values[@]}"; do echo "${os}" generate ${os} @@ -36,6 +36,8 @@ EOF N=$OS if [[ $OS =~ "debian" ]] || [[ $OS =~ "ubuntu" ]] ; then N="ubuntu" +elif [[ $OS =~ "rocky" ]] ; then + N="centos7" elif [[ $OS =~ "centos" ]] ; then N="centos7" fi @@ -48,6 +50,8 @@ echo "$line" >> $file N=$OS if [[ $OS =~ "centos" ]] ; then N="centos" +elif [[ $OS =~ "rocky" ]] ; then + N="centos" elif [[ $OS =~ "ubuntu1804" ]] ; then N="ubuntu1804" elif [[ $OS =~ "ubuntu" ]] ; then @@ -70,6 +74,8 @@ echo "# install dependencies" >> $file N=$OS if [[ $OS =~ "ubuntu" ]] ; then N="ubuntu1804" +elif [[ $OS =~ "rocky" ]] ; then + N="centos7" fi line=$(sed -n '2,$p' $dir/step01_"$N"_deps.sh) @@ -95,23 +101,26 @@ echo -en '\n' >> $file # install postgres N=$OS +if [[ $OS =~ "rocky" ]] ; then + N="centos" +fi echo -en '\n' >> $file echo "# install Postgres" >> $file -if [[ $OS =~ "centos" ]] ; then - number=$(sed -n '/#start-postgresql-installation-general/=' $dir/step01_"$N"_pg_deps.sh) +if [[ $N =~ "centos" ]] ; then + number=$(sed -n '/#start-postgresql-installation-general/=' $dir/step01_"$OS"_pg_deps.sh) nrs=$((number+1)) - number=$(sed -n '/#end-postgresql-installation-general/=' $dir/step01_"$N"_pg_deps.sh) + number=$(sed -n '/#end-postgresql-installation-general/=' $dir/step01_"$OS"_pg_deps.sh) nre=$((number-1)) - line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$N"_pg_deps.sh) + line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$OS"_pg_deps.sh) line="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//')" echo "$line" >> $file - number=$(sed -n '/#start-recommended/=' $dir/step01_"$N"_pg_deps.sh) + number=$(sed -n '/#start-recommended/=' $dir/step01_"$OS"_pg_deps.sh) nrs=$((number+1)) - number=$(sed -n '/#end-recommended/=' $dir/step01_"$N"_pg_deps.sh) + number=$(sed -n '/#end-recommended/=' $dir/step01_"$OS"_pg_deps.sh) nre=$((number-1)) - line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$N"_pg_deps.sh) + line=$(sed -n ''$nrs','$nre'p' $dir/step01_"$OS"_pg_deps.sh) # remove docker conditional line=`remove_docker_workaround "${line}"` else @@ -121,6 +130,7 @@ else ne=$((number-1)) line=$(sed -n ''$ns','$ne'p' $dir/step01_"$N"_pg_deps.sh) fi +N=$OS # remove leading whitespace line="$(echo -e "${line}" | sed -e 's/^[[:space:]]*//')" diff --git a/linux/step01_rocky9_ice_deps.sh b/linux/step01_rocky9_ice_deps.sh index bd07c54a..82e451d2 100644 --- a/linux/step01_rocky9_ice_deps.sh +++ b/linux/step01_rocky9_ice_deps.sh @@ -1,5 +1,6 @@ #!/bin/bash +#start-recommended dnf config-manager --set-enabled crb yum -y install bzip2 expat libdb-cxx @@ -9,3 +10,4 @@ tar xf Ice-3.6.5-rockylinux9-x86_64.tar.gz mv Ice-3.6.5 /opt/ice-3.6.5 echo /opt/ice-3.6.5/lib64 > /etc/ld.so.conf.d/ice-x86_64.conf ldconfig +#end-recommended \ No newline at end of file diff --git a/linux/step01_rocky9_pg_deps.sh b/linux/step01_rocky9_pg_deps.sh index f871c592..f6c3e024 100644 --- a/linux/step01_rocky9_pg_deps.sh +++ b/linux/step01_rocky9_pg_deps.sh @@ -1,9 +1,13 @@ #!/bin/bash -# pg 13 is installed by default +PGVER=${PGVER:-pg13} # pg 13 is installed by default + +#start-postgresql-installation-general + +#end-postgresql-installation-general +#start-recommended yum -y install postgresql-server postgresql -ls -all / if [ -f /.dockerenv ]; then su - postgres -c "/usr/bin/initdb -D /var/lib/pgsql/data --encoding=UTF8" echo "listen_addresses='*'" >> /var/lib/pgsql/data/postgresql.conf @@ -20,3 +24,5 @@ fi systemctl enable postgresql sed -i 's/ ident/ trust/g' /var/lib/pgsql/data/pg_hba.conf + +#end-recommended From 750e470e73dea8756feede05c7157bbe06208d69 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 29 Aug 2023 22:52:26 +0100 Subject: [PATCH 15/15] fix build --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb9f3fc6..dd88d27b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,8 @@ jobs: - name: Build docker image run: | cd linux/test - ./docker-build.sh $ENV - ./test_services.sh $ENV + PGVER=$PGVER ./docker-build.sh $ENV + ./test_services.sh env: ENV: ${{ matrix.os }} + PGVER: ${{ matrix.pg }}