From 1583fd17e7cd86804c3bf11f8eb213bb411933fc Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Mon, 6 Jun 2022 12:32:21 +0200
Subject: [PATCH] [Ubuntu] Remove apt-key from postgresql installer (#5686)

---
 images/linux/scripts/installers/postgresql.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh
index f3d38cf21..845adffc6 100644
--- a/images/linux/scripts/installers/postgresql.sh
+++ b/images/linux/scripts/installers/postgresql.sh
@@ -11,8 +11,8 @@ source $HELPER_SCRIPTS/install.sh
 REPO_URL="https://apt.postgresql.org/pub/repos/apt/"
 
 # Preparing repo for PostgreSQL
-wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-echo "deb $REPO_URL $(getOSVersionLabel)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
+wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgresql.gpg
+echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] $REPO_URL $(getOSVersionLabel)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
 # Fetch PostgreSQL version to install from the toolset
 toolsetVersion=$(get_toolset_value '.postgresql.version')
@@ -30,6 +30,7 @@ systemctl is-active --quiet postgresql.service && systemctl stop postgresql.serv
 systemctl disable postgresql.service
 
 rm /etc/apt/sources.list.d/pgdg.list
+rm /usr/share/keyrings/postgresql.gpg
 
 echo "postgresql $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt