From 20d5e6efff0a2cd90d759a260a4db4ed009dd473 Mon Sep 17 00:00:00 2001 From: thiagosantosleite Date: Wed, 18 Aug 2021 13:58:56 -0300 Subject: [PATCH] removing the temporary Dirty patch --- .../deb-compliant/entrypoint/entrypoint.bash | 6 ------ .../rhel-compliant/entrypoint/entrypoint.bash | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash index 57920d9ca..d241c6a46 100755 --- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash @@ -7,12 +7,6 @@ ARCH=$PROXYSQL_BUILD_ARCH echo "==> $ARCH architecture detected for package" -# Dirty patch to ensure OS deps are installed: -apt-get update -apt-get -y install gnutls-dev || true -apt-get -y install libgnutls28-dev || true -apt-get -y install libtool || true - # Delete package if exists rm -f "/opt/proxysql/binaries/proxysql_${CURVER}-${PKG_RELEASE}_$ARCH.deb" || true # Cleanup relic directories from a previously failed build diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash index 8f4f9b358..406274747 100755 --- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash @@ -7,18 +7,6 @@ env ARCH=$PROXYSQL_BUILD_ARCH echo "==> $ARCH architecture detected for package" -echo "==> Dirty patching to ensure OS deps are installed" - -if [[ -f "/usr/bin/python" ]] || [[ -h "/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 || true -fi - echo "==> Cleaning" # Delete package if exists rm -f /opt/proxysql/binaries/proxysql-${CURVER}-1-${PKG_RELEASE}.$ARCH.rpm || true