From 771bd70a339053a8fefb083e7feba56ae5258c42 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 27 Feb 2020 19:12:54 +0200
Subject: [PATCH] Fix tb-postgres docker image. Update postgreSQL version to 11

---
 msa/tb/docker-postgres/Dockerfile  | 6 +++++-
 msa/tb/docker-postgres/start-db.sh | 6 ++++--
 msa/tb/docker-postgres/stop-db.sh  | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index 297bad0753..a2a24442e4 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -17,7 +17,11 @@
 FROM thingsboard/openjdk8
 
 RUN apt-get update
-RUN apt-get install -y postgresql postgresql-contrib
+RUN apt-get install -y curl
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
+RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN apt-get update
+RUN apt-get install -y postgresql-11
 RUN update-rc.d postgresql disable
 
 RUN mkdir -p /var/log/postgres
diff --git a/msa/tb/docker-postgres/start-db.sh b/msa/tb/docker-postgres/start-db.sh
index e7b873fe83..dfbfc1dd68 100644
--- a/msa/tb/docker-postgres/start-db.sh
+++ b/msa/tb/docker-postgres/start-db.sh
@@ -17,13 +17,15 @@
 
 firstlaunch=${DATA_FOLDER}/.firstlaunch
 
+export PG_CTL=$(find /usr/lib/postgresql/ -name pg_ctl)
+
 if [ ! -d ${PGDATA} ]; then
     mkdir -p ${PGDATA}
     chown -R postgres:postgres ${PGDATA}
-    su postgres -c '/usr/lib/postgresql/10/bin/pg_ctl initdb -U postgres'
+    su postgres -c '${PG_CTL} initdb -U postgres'
 fi
 
-su postgres -c '/usr/lib/postgresql/10/bin/pg_ctl -l /var/log/postgres/postgres.log -w start'
+su postgres -c '${PG_CTL} -l /var/log/postgres/postgres.log -w start'
 
 if [ ! -f ${firstlaunch} ]; then
     su postgres -c 'psql -U postgres -d postgres -c "CREATE DATABASE thingsboard"'
diff --git a/msa/tb/docker-postgres/stop-db.sh b/msa/tb/docker-postgres/stop-db.sh
index fc5cb1784c..66596d13c8 100644
--- a/msa/tb/docker-postgres/stop-db.sh
+++ b/msa/tb/docker-postgres/stop-db.sh
@@ -15,4 +15,6 @@
 # limitations under the License.
 #
 
-su postgres -c '/usr/lib/postgresql/10/bin/pg_ctl stop'
+export PG_CTL=$(find /usr/lib/postgresql/ -name pg_ctl)
+
+su postgres -c '${PG_CTL} stop'