Merge branch 'release/v1.6'

m3hr24d · m3hr24d · commit 1834b5ebdda1 · 2019-06-30T17:53:42.000+04:30
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ help:
 	@echo '     / __  / __ \/ ___/ //_/ _ \/ ___/  / ___/ / / / __ `__ \/ /_/ __ \/ __ \/ / / /	  '
 	@echo '    / /_/ / /_/ / /__/ ,< /  __/ /     (__  ) /_/ / / / / / / __/ /_/ / / / / /_/ / 	  '
 	@echo '    \__,_/\____/\___/_/|_|\___/_/     /____/\__, /_/ /_/ /_/_/  \____/_/ /_/\__, /  	  '
-	@echo '                                           /____/                          /____/   	v1.5'
+	@echo '                                           /____/                          /____/   	v1.6'
 	@echo ''
 	@echo "build REGISTRY_NAME= DISTRO="
 	@echo "  Create docker image from specific distro."
diff --git a/ci/build.sh b/ci/build.sh
@@ -7,4 +7,12 @@ for DIST in ./dists/*; do
 	[ -d "${DIST}" ] || continue
 	DIST="$(basename "${DIST}")"
 	make build REGISTRY_NAME=$CI_REGISTRY_IMAGE DISTRO=${DIST} VERSION=${CI_COMMIT_REF_NAME}-${DIST}
+	if [ "$?" -eq "0" ]; then
+	    echo "[OK]: The image built successfully."
+	    docker images
+	else
+		echo "[ERROR]: An error occurred in building image."
+		docker images
+		exit 1
+	fi
 done
diff --git a/dists/debian/assets/install.sh b/dists/debian/assets/install.sh
@@ -25,7 +25,8 @@ DEBCONF_FRONTEND=noninteractive apt-get update \
 	ca-certificates \
 	gnupg2 \
 	apt-transport-https \
-	wget
+	wget \
+	lsb-release
 
 ##########################
 # config apt source list #
@@ -37,6 +38,9 @@ wget -q https://nginx.org/keys/nginx_signing.key -O- | apt-key add -
 echo "deb https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list
 echo "deb-src https://nginx.org/packages/debian/ stretch nginx" >> /etc/apt/sources.list.d/nginx.list
 
+echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' >  /etc/apt/sources.list.d/pgdg.list
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+
 wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 NODEJS_VERSION=node_12.x
 DISTRO="$(lsb_release -s -c)"
@@ -82,6 +86,7 @@ DEBCONF_FRONTEND=noninteractive apt-get install -y \
 	php7.2-xsl \
 	php7.2-curl \
 	mysql-client \
+	postgresql-client-10 \
 	nodejs
 
 ###############################
