Merge branch 'v2.0.9' of https://github.com/sysown/proxysql into v2.0.9

Makefile

@@ -160,7 +160,7 @@ clean:
 	cd src && ${MAKE} clean
 	cd test/tap && ${MAKE} clean
 
-packages: centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian7 debian7-dbg debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
+packages: centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
 .PHONY: packages
 
 centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm

docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash

@@ -3,7 +3,7 @@
 set -eu
 
 # Dirty patch to ensure OS deps are installed:
-apt-get -y install gnutls-dev libtool || true
+apt-get -y install libgnutls28-dev libtool || true
 
 # Delete package if exists
 rm -f "/opt/proxysql/binaries/proxysql_${CURVER}-${PKG_RELEASE}_amd64.deb" || true

docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash

@@ -5,7 +5,16 @@ echo "==> Build environment:"
 env
 
 echo "==> Dirty patching to ensure OS deps are installed"
-yum -y install gnutls-devel libtool || true
+
+if [[ -f "/usr/bin/python" ]];
+then
+    echo "==> Installing dependancies for RHEL compliant version 7"
+    yum -y install gnutls-devel libtool || true
+else
+    echo "==> Installing dependancies for RHEL compliant version 8"
+    yum -y install python2 gnutls-devel libtool || true
+    ln -s /usr/bin/python2.7 /usr/bin/python
+fi
 
 echo "==> Cleaning"
 # Delete package if exists

docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash

@@ -9,7 +9,7 @@ env
 
 echo "==> Dirty patching to ensure OS deps are installed"
 
-if [[ $(rpm -E %{rhel} | cut -d"." -f1) -eq "7" ]]; 
+if [[ -f "/usr/bin/python" ]];
 then 
     echo "==> Installing dependancies for RHEL compliant version 7"
     yum -y install gnutls-devel libtool || true