From 95cd934020f611ccc394dc385c5bdc0d0d654d98 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 31 Jan 2020 12:21:33 +0300 Subject: [PATCH 1/2] add libpq-dev --- images/linux/scripts/installers/postgresql.sh | 16 ++++++++++++++++ images/linux/ubuntu1604.json | 1 + images/linux/ubuntu1804.json | 1 + 3 files changed, 18 insertions(+) create mode 100644 images/linux/scripts/installers/postgresql.sh diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh new file mode 100644 index 000000000..b31506719 --- /dev/null +++ b/images/linux/scripts/installers/postgresql.sh @@ -0,0 +1,16 @@ +#!/bin/bash +################################################################################ +## File: postgresql.sh +## Desc: Installs Postgresql +################################################################################ + +# Source the helpers for use with the script +source $HELPER_SCRIPTS/document.sh + +echo "Install libpq-dev" +apt-get install libpq-dev + +echo "Install Postgresql Client" +apt-get install postgresql-client + +DocumentInstalledItem "($(psql -V 2>&1 | cut -d ' ' -f 1,2,3))" \ No newline at end of file diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json index bca6a3ed0..b8a25a873 100644 --- a/images/linux/ubuntu1604.json +++ b/images/linux/ubuntu1604.json @@ -152,6 +152,7 @@ "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1604/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", + "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/1604/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json index 5c57731d8..f141db02a 100644 --- a/images/linux/ubuntu1804.json +++ b/images/linux/ubuntu1804.json @@ -155,6 +155,7 @@ "{{template_dir}}/scripts/installers/phantomjs.sh", "{{template_dir}}/scripts/installers/1804/php.sh", "{{template_dir}}/scripts/installers/pollinate.sh", + "{{template_dir}}/scripts/installers/postgresql.sh", "{{template_dir}}/scripts/installers/1804/powershellcore.sh", "{{template_dir}}/scripts/installers/ruby.sh", "{{template_dir}}/scripts/installers/rust.sh", From 66eb6d187850167ed6868d720f4deef62b1889ae Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Mon, 3 Feb 2020 09:37:47 +0300 Subject: [PATCH 2/2] remove extra () --- images/linux/scripts/installers/postgresql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/postgresql.sh b/images/linux/scripts/installers/postgresql.sh index b31506719..9f2988a84 100644 --- a/images/linux/scripts/installers/postgresql.sh +++ b/images/linux/scripts/installers/postgresql.sh @@ -13,4 +13,4 @@ apt-get install libpq-dev echo "Install Postgresql Client" apt-get install postgresql-client -DocumentInstalledItem "($(psql -V 2>&1 | cut -d ' ' -f 1,2,3))" \ No newline at end of file +DocumentInstalledItem "$(psql -V 2>&1 | cut -d ' ' -f 1,2,3)" \ No newline at end of file