From ab083721a28eb56f8bb359cdb834d3186f39a9cc Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 1 Apr 2024 17:39:49 +0700 Subject: [PATCH] Add use of the mysql-innovation repository (#186) --- install/OneClickInstall/install-Debian/install-preq.sh | 8 ++++++++ install/OneClickInstall/install-RedHat/install-preq.sh | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/install/OneClickInstall/install-Debian/install-preq.sh b/install/OneClickInstall/install-Debian/install-preq.sh index 9c3e858d53..6c2c0a2821 100644 --- a/install/OneClickInstall/install-Debian/install-preq.sh +++ b/install/OneClickInstall/install-Debian/install-preq.sh @@ -74,6 +74,14 @@ elif dpkg -l | grep -q "mysql-apt-config" && [ "$(apt-cache policy mysql-apt-con rm -f ${MYSQL_PACKAGE_NAME} fi +if ! grep -q "mysql-innovation" /etc/apt/sources.list.d/mysql.list; then + echo "deb [signed-by=/usr/share/keyrings/mysql-apt-config.gpg] http://repo.mysql.com/apt/${DIST} ${DISTRIB_CODENAME} mysql-innovation" | sudo tee -a /etc/apt/sources.list.d/mysql.list + + if apt-get -y update 2>&1 | grep -q "^W: .*mysql-innovation"; then + sudo sed -i '/mysql-innovation/d' /etc/apt/sources.list.d/mysql.list + fi +fi + # add redis repo if [ "$DIST" = "ubuntu" ]; then curl -fsSL https://packages.redis.io/gpg | gpg --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/redis.gpg --import diff --git a/install/OneClickInstall/install-RedHat/install-preq.sh b/install/OneClickInstall/install-RedHat/install-preq.sh index fc6ccb8847..82194ecf60 100644 --- a/install/OneClickInstall/install-RedHat/install-preq.sh +++ b/install/OneClickInstall/install-RedHat/install-preq.sh @@ -57,6 +57,10 @@ dnf remove -y @mysql && dnf module -y reset mysql && dnf module -y disable mysql MYSQL_REPO_VERSION="$(curl https://repo.mysql.com | grep -oP "mysql80-community-release-${MYSQL_DISTR_NAME}${REV}-\K.*" | grep -o '^[^.]*' | sort | tail -n1)" yum localinstall -y https://repo.mysql.com/mysql80-community-release-${MYSQL_DISTR_NAME}${REV}-${MYSQL_REPO_VERSION}.noarch.rpm || true +if ! yum repolist enabled | grep -q mysql-innovation-community; then + sudo yum-config-manager --enable mysql-innovation-community +fi + if ! rpm -q mysql-community-server; then MYSQL_FIRST_TIME_INSTALL="true"; fi