Skip to content

Commit

Permalink
[Automated] Merge 5.x into master (#172)
Browse files Browse the repository at this point in the history
* fix(docker-monolithic): add stop_grace_period (#162)

* fix(linux): update mysql apt repo to 0.8.29 (#166)

* chore(deps): bump pascalgn/automerge-action from 0.15.6 to 0.16.2 (#169)

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.6 to 0.16.2.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](pascalgn/automerge-action@v0.15.6...v0.16.2)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(linux): update RHEL MySQL rpms (#171)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kieran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 17, 2024
1 parent 25e1ed0 commit b9e5af7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/linux/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,10 @@ install_mysql() {

if [[ $os_type == 'rhel' ]]; then
if [[ $os_version == '8' ]]; then
install_rpm https://dev.mysql.com/get/mysql80-community-release-el8-4.noarch.rpm
install_rpm https://dev.mysql.com/get/mysql80-community-release-el8-9.noarch.rpm
dnf -y module disable mysql
else
install_rpm https://dev.mysql.com/get/mysql80-community-release-el9-1.noarch.rpm
install_rpm https://dev.mysql.com/get/mysql80-community-release-el9-5.noarch.rpm
fi
fi

Expand Down

0 comments on commit b9e5af7

Please sign in to comment.