From de4a4a996de430baeb2bafd1d9d38e27372562b8 Mon Sep 17 00:00:00 2001 From: Nick Vyzas Date: Fri, 14 Feb 2020 20:46:56 +0200 Subject: [PATCH 1/2] Changing patch libgnutls package name --- docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash index 10df4b6a9..cdd910ed0 100755 --- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash +++ b/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 From 2e318c457729e01e8758333c39bc4eb22ac482aa Mon Sep 17 00:00:00 2001 From: Nick Vyzas Date: Sat, 15 Feb 2020 15:17:33 +0200 Subject: [PATCH 2/2] Removing Debian and making RHEL entrypoint generic --- Makefile | 2 +- .../rhel-compliant/entrypoint/entrypoint.bash | 11 ++++++++++- .../rhel-compliant/rhel7/entrypoint/entrypoint.bash | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 50d50966a..6526d5cc6 100644 --- a/Makefile +++ b/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 diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash index c7607a51b..bf6321f30 100755 --- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash +++ b/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 diff --git a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash index f24bdb0dd..b48a59368 100755 --- a/docker/images/proxysql/rhel-compliant/rhel7/entrypoint/entrypoint.bash +++ b/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