Merge pull request #2471 from ome/create-pull-request/patch

Changes from upstream repositories: openmicroscopy
ome · Jan 24, 2025 · c08d6dc · c08d6dc
2 parents a2d8815 + 555ec72
commit c08d6dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/omero/conf_autogen.py b/omero/conf_autogen.py
@@ -13,6 +13,6 @@
 version_matlab = "5.5.6"
 version_dsl_plugin = "5.5.2"
 version_blitz_plugin = "5.5.2"
-version_py = "5.19.5"
+version_py = "5.19.6"
 version_web = "5.28.0"
 version_dropbox = "5.7.0"
diff --git a/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2204.sh b/omero/sysadmins/unix/walkthrough/walkthrough_ubuntu2204.sh
@@ -39,9 +39,11 @@ ldconfig
 
 
 # install Postgres
-apt-get install -y gnupg
-echo "deb http://apt.postgresql.org/pub/repos/apt jammy-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 install -y curl ca-certificates
+install -d /usr/share/postgresql-common/pgdg
+curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc
+sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
 apt-get update
 apt-get -y install postgresql-15
 service postgresql start