This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 43acc4ffbd Use common method of import GPG keys (#36244)
43acc4ffbd is described below
commit 43acc4ffbd97bcdaf7c4c0b47921beea72aa5bf1
Author: Andrey Anshin <[email protected]>
AuthorDate: Mon Dec 18 18:14:04 2023 +0400
Use common method of import GPG keys (#36244)
---
Dockerfile | 115 +++++++++++++++++++------------------
Dockerfile.ci | 113 ++++++++++++++++++------------------
scripts/docker/common.sh | 30 ++++++++++
scripts/docker/install_mssql.sh | 27 +++++----
scripts/docker/install_mysql.sh | 44 +++-----------
scripts/docker/install_postgres.sh | 15 ++---
6 files changed, 176 insertions(+), 168 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 52fd6a737e..e7a3125533 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -214,46 +214,19 @@ EOF
# The content below is automatically copied from
scripts/docker/install_mysql.sh
COPY <<"EOF" /install_mysql.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
+
+common::get_colors
declare -a packages
-MYSQL_LTS_VERSION="8.0"
-MARIADB_LTS_VERSION="10.11"
-readonly MYSQL_LTS_VERSION
-readonly MARIADB_LTS_VERSION
-
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_YELLOW=$'\e[1;33m'
-readonly COLOR_YELLOW
-COLOR_RED=$'\e[1;31m'
-readonly COLOR_RED
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+readonly MYSQL_LTS_VERSION="8.0"
+readonly MARIADB_LTS_VERSION="10.11"
: "${INSTALL_MYSQL_CLIENT:?Should be true or false}"
: "${INSTALL_MYSQL_CLIENT_TYPE:-mariadb}"
-export_key() {
- local key="${1}"
- local name="${2:-mysql}"
-
- echo "${COLOR_BLUE}Verify and export GPG public key ${key}${COLOR_RESET}"
- GNUPGHOME="$(mktemp -d)"
- export GNUPGHOME
- set +e
- for keyserver in $(shuf -e ha.pool.sks-keyservers.net
hkp://p80.pool.sks-keyservers.net:80 \
- keyserver.ubuntu.com
hkp://keyserver.ubuntu.com:80)
- do
- gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
- done
- set -e
- gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
- gpgconf --kill all
- rm -rf "${GNUPGHOME}"
- unset GNUPGHOME
-}
-
install_mysql_client() {
if [[ "${1}" == "dev" ]]; then
packages=("libmysqlclient-dev" "mysql-client")
@@ -271,7 +244,7 @@ install_mysql_client() {
exit 1
fi
- export_key "B7B3B788A8D3785C" "mysql"
+ common::import_trusted_gpg "B7B3B788A8D3785C" "mysql"
echo
echo "${COLOR_BLUE}Installing Oracle MySQL client version
${MYSQL_LTS_VERSION}: ${1}${COLOR_RESET}"
@@ -313,7 +286,7 @@ install_mariadb_client() {
exit 1
fi
- export_key "0xF1656F24C74CD1D8" "mariadb"
+ common::import_trusted_gpg "0xF1656F24C74CD1D8" "mariadb"
echo
echo "${COLOR_BLUE}Installing MariaDB client version
${MARIADB_LTS_VERSION}: ${1}${COLOR_RESET}"
@@ -355,16 +328,16 @@ EOF
# The content below is automatically copied from
scripts/docker/install_mssql.sh
COPY <<"EOF" /install_mssql.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
-: "${AIRFLOW_PIP_VERSION:?Should be set}"
+common::get_colors
+declare -a packages
+: "${AIRFLOW_PIP_VERSION:?Should be set}"
: "${INSTALL_MSSQL_CLIENT:?Should be true or false}"
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
function install_mssql_client() {
# Install MsSQL client from Microsoft repositories
@@ -374,21 +347,19 @@ function install_mssql_client() {
echo
return
fi
+ packages=("msodbcsql18")
+
+ common::import_trusted_gpg "EB3E94ADBE1229CF" "microsoft"
+
echo
echo "${COLOR_BLUE}Installing mssql client${COLOR_RESET}"
echo
- local distro
- local version
- distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
- version=$(lsb_release -rs)
- local driver=msodbcsql18
- curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg
--dearmor -o /usr/share/keyrings/microsoft-prod.gpg
- curl --silent https://packages.microsoft.com/keys/microsoft.asc | apt-key
add - >/dev/null 2>&1
- curl --silent
"https://packages.microsoft.com/config/${distro}/${version}/prod.list"; > \
+
+ echo "deb [arch=amd64,arm64]
https://packages.microsoft.com/debian/$(lsb_release -rs)/prod $(lsb_release
-cs) main" > \
/etc/apt/sources.list.d/mssql-release.list
apt-get update -yqq
apt-get upgrade -yqq
- ACCEPT_EULA=Y apt-get -yqq install -y --no-install-recommends "${driver}"
+ ACCEPT_EULA=Y apt-get -yqq install --no-install-recommends "${packages[@]}"
rm -rf /var/lib/apt/lists/*
apt-get autoremove -yqq --purge
apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -400,13 +371,11 @@ EOF
# The content below is automatically copied from
scripts/docker/install_postgres.sh
COPY <<"EOF" /install_postgres.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
set -euo pipefail
-declare -a packages
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+common::get_colors
+declare -a packages
: "${INSTALL_POSTGRES_CLIENT:?Should be true or false}"
@@ -426,8 +395,10 @@ install_postgres_client() {
exit 1
fi
- curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
- echo "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release
-cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+ common::import_trusted_gpg "7FCC7D46ACCC4CF8" "postgres"
+
+ echo "deb [arch=amd64,arm64] https://apt.postgresql.org/pub/repos/apt/
$(lsb_release -cs)-pgdg main" > \
+ /etc/apt/sources.list.d/pgdg.list
apt-get update
apt-get install --no-install-recommends -y "${packages[@]}"
apt-get autoremove -yqq --purge
@@ -571,6 +542,36 @@ function common::install_pip_version() {
fi
mkdir -p "${HOME}/.local/bin"
}
+
+function common::import_trusted_gpg() {
+ common::get_colors
+
+ local key=${1:?${COLOR_RED}First argument expects OpenPGP Key
ID${COLOR_RESET}}
+ local name=${2:?${COLOR_RED}Second argument expected trust storage
name${COLOR_RESET}}
+ # Please note that not all servers could be used for retrieve keys
+ # sks-keyservers.net: Unmaintained and DNS taken down due to GDPR
requests.
+ # keys.openpgp.org: User ID Mandatory, not suitable for APT repositories
+ # keyring.debian.org: Only accept keys in Debian keyring.
+ # pgp.mit.edu: High response time.
+ local keyservers=(
+ "hkps://keyserver.ubuntu.com"
+ "hkps://pgp.surf.nl"
+ )
+
+ GNUPGHOME="$(mktemp -d)"
+ export GNUPGHOME
+ set +e
+ for keyserver in $(shuf -e "${keyservers[@]}"); do
+ echo "${COLOR_BLUE}Try to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
+ echo "${COLOR_YELLOW}Unable to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ done
+ set -e
+ gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
+ gpgconf --kill all
+ rm -rf "${GNUPGHOME}"
+ unset GNUPGHOME
+}
EOF
# The content below is automatically copied from scripts/docker/pip
@@ -1249,6 +1250,8 @@ ENV INSTALL_MYSQL_CLIENT=${INSTALL_MYSQL_CLIENT} \
INSTALL_MSSQL_CLIENT=${INSTALL_MSSQL_CLIENT} \
INSTALL_POSTGRES_CLIENT=${INSTALL_POSTGRES_CLIENT}
+COPY --from=scripts common.sh /scripts/docker/
+
# Only copy mysql/mssql installation scripts for now - so that changing the
other
# scripts which are needed much later will not invalidate the docker layer here
COPY --from=scripts install_mysql.sh install_mssql.sh install_postgres.sh
/scripts/docker/
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 96ee6dea24..365185ccf9 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -174,46 +174,19 @@ EOF
# The content below is automatically copied from
scripts/docker/install_mysql.sh
COPY <<"EOF" /install_mysql.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
-declare -a packages
-MYSQL_LTS_VERSION="8.0"
-MARIADB_LTS_VERSION="10.11"
-readonly MYSQL_LTS_VERSION
-readonly MARIADB_LTS_VERSION
+common::get_colors
+declare -a packages
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_YELLOW=$'\e[1;33m'
-readonly COLOR_YELLOW
-COLOR_RED=$'\e[1;31m'
-readonly COLOR_RED
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+readonly MYSQL_LTS_VERSION="8.0"
+readonly MARIADB_LTS_VERSION="10.11"
: "${INSTALL_MYSQL_CLIENT:?Should be true or false}"
: "${INSTALL_MYSQL_CLIENT_TYPE:-mariadb}"
-export_key() {
- local key="${1}"
- local name="${2:-mysql}"
-
- echo "${COLOR_BLUE}Verify and export GPG public key ${key}${COLOR_RESET}"
- GNUPGHOME="$(mktemp -d)"
- export GNUPGHOME
- set +e
- for keyserver in $(shuf -e ha.pool.sks-keyservers.net
hkp://p80.pool.sks-keyservers.net:80 \
- keyserver.ubuntu.com
hkp://keyserver.ubuntu.com:80)
- do
- gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
- done
- set -e
- gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
- gpgconf --kill all
- rm -rf "${GNUPGHOME}"
- unset GNUPGHOME
-}
-
install_mysql_client() {
if [[ "${1}" == "dev" ]]; then
packages=("libmysqlclient-dev" "mysql-client")
@@ -231,7 +204,7 @@ install_mysql_client() {
exit 1
fi
- export_key "B7B3B788A8D3785C" "mysql"
+ common::import_trusted_gpg "B7B3B788A8D3785C" "mysql"
echo
echo "${COLOR_BLUE}Installing Oracle MySQL client version
${MYSQL_LTS_VERSION}: ${1}${COLOR_RESET}"
@@ -273,7 +246,7 @@ install_mariadb_client() {
exit 1
fi
- export_key "0xF1656F24C74CD1D8" "mariadb"
+ common::import_trusted_gpg "0xF1656F24C74CD1D8" "mariadb"
echo
echo "${COLOR_BLUE}Installing MariaDB client version
${MARIADB_LTS_VERSION}: ${1}${COLOR_RESET}"
@@ -315,16 +288,16 @@ EOF
# The content below is automatically copied from
scripts/docker/install_mssql.sh
COPY <<"EOF" /install_mssql.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
-: "${AIRFLOW_PIP_VERSION:?Should be set}"
+common::get_colors
+declare -a packages
+: "${AIRFLOW_PIP_VERSION:?Should be set}"
: "${INSTALL_MSSQL_CLIENT:?Should be true or false}"
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
function install_mssql_client() {
# Install MsSQL client from Microsoft repositories
@@ -334,21 +307,19 @@ function install_mssql_client() {
echo
return
fi
+ packages=("msodbcsql18")
+
+ common::import_trusted_gpg "EB3E94ADBE1229CF" "microsoft"
+
echo
echo "${COLOR_BLUE}Installing mssql client${COLOR_RESET}"
echo
- local distro
- local version
- distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
- version=$(lsb_release -rs)
- local driver=msodbcsql18
- curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg
--dearmor -o /usr/share/keyrings/microsoft-prod.gpg
- curl --silent https://packages.microsoft.com/keys/microsoft.asc | apt-key
add - >/dev/null 2>&1
- curl --silent
"https://packages.microsoft.com/config/${distro}/${version}/prod.list"; > \
+
+ echo "deb [arch=amd64,arm64]
https://packages.microsoft.com/debian/$(lsb_release -rs)/prod $(lsb_release
-cs) main" > \
/etc/apt/sources.list.d/mssql-release.list
apt-get update -yqq
apt-get upgrade -yqq
- ACCEPT_EULA=Y apt-get -yqq install -y --no-install-recommends "${driver}"
+ ACCEPT_EULA=Y apt-get -yqq install --no-install-recommends "${packages[@]}"
rm -rf /var/lib/apt/lists/*
apt-get autoremove -yqq --purge
apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -360,13 +331,11 @@ EOF
# The content below is automatically copied from
scripts/docker/install_postgres.sh
COPY <<"EOF" /install_postgres.sh
#!/usr/bin/env bash
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
set -euo pipefail
-declare -a packages
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+common::get_colors
+declare -a packages
: "${INSTALL_POSTGRES_CLIENT:?Should be true or false}"
@@ -386,8 +355,10 @@ install_postgres_client() {
exit 1
fi
- curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
- echo "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release
-cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+ common::import_trusted_gpg "7FCC7D46ACCC4CF8" "postgres"
+
+ echo "deb [arch=amd64,arm64] https://apt.postgresql.org/pub/repos/apt/
$(lsb_release -cs)-pgdg main" > \
+ /etc/apt/sources.list.d/pgdg.list
apt-get update
apt-get install --no-install-recommends -y "${packages[@]}"
apt-get autoremove -yqq --purge
@@ -531,6 +502,36 @@ function common::install_pip_version() {
fi
mkdir -p "${HOME}/.local/bin"
}
+
+function common::import_trusted_gpg() {
+ common::get_colors
+
+ local key=${1:?${COLOR_RED}First argument expects OpenPGP Key
ID${COLOR_RESET}}
+ local name=${2:?${COLOR_RED}Second argument expected trust storage
name${COLOR_RESET}}
+ # Please note that not all servers could be used for retrieve keys
+ # sks-keyservers.net: Unmaintained and DNS taken down due to GDPR
requests.
+ # keys.openpgp.org: User ID Mandatory, not suitable for APT repositories
+ # keyring.debian.org: Only accept keys in Debian keyring.
+ # pgp.mit.edu: High response time.
+ local keyservers=(
+ "hkps://keyserver.ubuntu.com"
+ "hkps://pgp.surf.nl"
+ )
+
+ GNUPGHOME="$(mktemp -d)"
+ export GNUPGHOME
+ set +e
+ for keyserver in $(shuf -e "${keyservers[@]}"); do
+ echo "${COLOR_BLUE}Try to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
+ echo "${COLOR_YELLOW}Unable to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ done
+ set -e
+ gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
+ gpgconf --kill all
+ rm -rf "${GNUPGHOME}"
+ unset GNUPGHOME
+}
EOF
# The content below is automatically copied from
scripts/docker/install_pipx_tools.sh
diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh
index c01c15f97d..db648e8308 100644
--- a/scripts/docker/common.sh
+++ b/scripts/docker/common.sh
@@ -83,3 +83,33 @@ function common::install_pip_version() {
fi
mkdir -p "${HOME}/.local/bin"
}
+
+function common::import_trusted_gpg() {
+ common::get_colors
+
+ local key=${1:?${COLOR_RED}First argument expects OpenPGP Key
ID${COLOR_RESET}}
+ local name=${2:?${COLOR_RED}Second argument expected trust storage
name${COLOR_RESET}}
+ # Please note that not all servers could be used for retrieve keys
+ # sks-keyservers.net: Unmaintained and DNS taken down due to GDPR
requests.
+ # keys.openpgp.org: User ID Mandatory, not suitable for APT repositories
+ # keyring.debian.org: Only accept keys in Debian keyring.
+ # pgp.mit.edu: High response time.
+ local keyservers=(
+ "hkps://keyserver.ubuntu.com"
+ "hkps://pgp.surf.nl"
+ )
+
+ GNUPGHOME="$(mktemp -d)"
+ export GNUPGHOME
+ set +e
+ for keyserver in $(shuf -e "${keyservers[@]}"); do
+ echo "${COLOR_BLUE}Try to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
+ echo "${COLOR_YELLOW}Unable to receive GPG public key ${key} from
${keyserver}${COLOR_RESET}"
+ done
+ set -e
+ gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
+ gpgconf --kill all
+ rm -rf "${GNUPGHOME}"
+ unset GNUPGHOME
+}
diff --git a/scripts/docker/install_mssql.sh b/scripts/docker/install_mssql.sh
index b5c74e44bc..9f33e56e8a 100644
--- a/scripts/docker/install_mssql.sh
+++ b/scripts/docker/install_mssql.sh
@@ -16,16 +16,17 @@
# specific language governing permissions and limitations
# under the License.
# shellcheck shell=bash
+# shellcheck source=scripts/docker/common.sh
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
-: "${AIRFLOW_PIP_VERSION:?Should be set}"
+common::get_colors
+declare -a packages
+: "${AIRFLOW_PIP_VERSION:?Should be set}"
: "${INSTALL_MSSQL_CLIENT:?Should be true or false}"
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
function install_mssql_client() {
# Install MsSQL client from Microsoft repositories
@@ -35,21 +36,19 @@ function install_mssql_client() {
echo
return
fi
+ packages=("msodbcsql18")
+
+ common::import_trusted_gpg "EB3E94ADBE1229CF" "microsoft"
+
echo
echo "${COLOR_BLUE}Installing mssql client${COLOR_RESET}"
echo
- local distro
- local version
- distro=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
- version=$(lsb_release -rs)
- local driver=msodbcsql18
- curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | sudo gpg
--dearmor -o /usr/share/keyrings/microsoft-prod.gpg
- curl --silent https://packages.microsoft.com/keys/microsoft.asc | apt-key
add - >/dev/null 2>&1
- curl --silent
"https://packages.microsoft.com/config/${distro}/${version}/prod.list"; > \
+
+ echo "deb [arch=amd64,arm64]
https://packages.microsoft.com/debian/$(lsb_release -rs)/prod $(lsb_release
-cs) main" > \
/etc/apt/sources.list.d/mssql-release.list
apt-get update -yqq
apt-get upgrade -yqq
- ACCEPT_EULA=Y apt-get -yqq install -y --no-install-recommends "${driver}"
+ ACCEPT_EULA=Y apt-get -yqq install --no-install-recommends "${packages[@]}"
rm -rf /var/lib/apt/lists/*
apt-get autoremove -yqq --purge
apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/scripts/docker/install_mysql.sh b/scripts/docker/install_mysql.sh
index 8721a4263c..3d8a3e2cd9 100644
--- a/scripts/docker/install_mysql.sh
+++ b/scripts/docker/install_mysql.sh
@@ -16,48 +16,22 @@
# specific language governing permissions and limitations
# under the License.
# shellcheck shell=bash
+# shellcheck source=scripts/docker/common.sh
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
+
set -euo pipefail
+
+common::get_colors
declare -a packages
#
https://dev.mysql.com/blog-archive/introducing-mysql-innovation-and-long-term-support-lts-versions/
-MYSQL_LTS_VERSION="8.0"
+readonly MYSQL_LTS_VERSION="8.0"
# https://mariadb.org/about/#maintenance-policy
-MARIADB_LTS_VERSION="10.11"
-readonly MYSQL_LTS_VERSION
-readonly MARIADB_LTS_VERSION
-
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_YELLOW=$'\e[1;33m'
-readonly COLOR_YELLOW
-COLOR_RED=$'\e[1;31m'
-readonly COLOR_RED
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+readonly MARIADB_LTS_VERSION="10.11"
: "${INSTALL_MYSQL_CLIENT:?Should be true or false}"
: "${INSTALL_MYSQL_CLIENT_TYPE:-mariadb}"
-export_key() {
- local key="${1}"
- local name="${2:-mysql}"
-
- echo "${COLOR_BLUE}Verify and export GPG public key ${key}${COLOR_RESET}"
- GNUPGHOME="$(mktemp -d)"
- export GNUPGHOME
- set +e
- for keyserver in $(shuf -e ha.pool.sks-keyservers.net
hkp://p80.pool.sks-keyservers.net:80 \
- keyserver.ubuntu.com
hkp://keyserver.ubuntu.com:80)
- do
- gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break
- done
- set -e
- gpg --export "${key}" > "/etc/apt/trusted.gpg.d/${name}.gpg"
- gpgconf --kill all
- rm -rf "${GNUPGHOME}"
- unset GNUPGHOME
-}
-
install_mysql_client() {
if [[ "${1}" == "dev" ]]; then
packages=("libmysqlclient-dev" "mysql-client")
@@ -75,7 +49,7 @@ install_mysql_client() {
exit 1
fi
- export_key "B7B3B788A8D3785C" "mysql"
+ common::import_trusted_gpg "B7B3B788A8D3785C" "mysql"
echo
echo "${COLOR_BLUE}Installing Oracle MySQL client version
${MYSQL_LTS_VERSION}: ${1}${COLOR_RESET}"
@@ -117,7 +91,7 @@ install_mariadb_client() {
exit 1
fi
- export_key "0xF1656F24C74CD1D8" "mariadb"
+ common::import_trusted_gpg "0xF1656F24C74CD1D8" "mariadb"
echo
echo "${COLOR_BLUE}Installing MariaDB client version
${MARIADB_LTS_VERSION}: ${1}${COLOR_RESET}"
diff --git a/scripts/docker/install_postgres.sh
b/scripts/docker/install_postgres.sh
index 252826f77c..4af446a7a6 100644
--- a/scripts/docker/install_postgres.sh
+++ b/scripts/docker/install_postgres.sh
@@ -16,13 +16,12 @@
# specific language governing permissions and limitations
# under the License.
# shellcheck shell=bash
+# shellcheck source=scripts/docker/common.sh
+. "$( dirname "${BASH_SOURCE[0]}" )/common.sh"
set -euo pipefail
-declare -a packages
-COLOR_BLUE=$'\e[34m'
-readonly COLOR_BLUE
-COLOR_RESET=$'\e[0m'
-readonly COLOR_RESET
+common::get_colors
+declare -a packages
: "${INSTALL_POSTGRES_CLIENT:?Should be true or false}"
@@ -42,8 +41,10 @@ install_postgres_client() {
exit 1
fi
- curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
- echo "deb https://apt.postgresql.org/pub/repos/apt/ $(lsb_release
-cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+ common::import_trusted_gpg "7FCC7D46ACCC4CF8" "postgres"
+
+ echo "deb [arch=amd64,arm64] https://apt.postgresql.org/pub/repos/apt/
$(lsb_release -cs)-pgdg main" > \
+ /etc/apt/sources.list.d/pgdg.list
apt-get update
apt-get install --no-install-recommends -y "${packages[@]}"
apt-get autoremove -yqq --purge
