Skip to content

Commit 90ced5b

Browse files
authored
Merge pull request #150 from movabletype/fedora40_docker_entrypoint
Fedora40 docker entrypoint
2 parents c911c1f + 789ce1e commit 90ced5b

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

bin/update_dockerfile.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ sub load_prereqs {
14241424
% if ($type eq 'centos6') {
14251425
service mysqld start
14261426
service memcached start
1427-
% } elsif ($type =~ /^(?:centos7|fedora23|oracle|oracle8|amazonlinux|amazonlinux2022)$/) {
1427+
% } elsif ($type =~ /^(?:centos7|fedora23|fedora40|oracle|oracle8|amazonlinux|amazonlinux2022)$/) {
14281428
mysql_install_db --user=mysql --skip-name-resolve --force >/dev/null
14291429
14301430
bash -c "cd /usr; mysqld_safe --user=mysql --datadir=/var/lib/mysql &"

fedora40/docker-entrypoint.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#!/bin/bash
22
set -e
33

4-
echo 'default_authentication_plugin = mysql_native_password' >> /etc/my.cnf.d/mysql-server.cnf
5-
mysqld --initialize-insecure --user=mysql --skip-name-resolve >/dev/null
6-
7-
bash -c "cd /usr; mysqld --datadir='/var/lib/mysql' --user=mysql &"
4+
mysql_install_db --user=mysql --skip-name-resolve --force >/dev/null
85

6+
bash -c "cd /usr; mysqld_safe --user=mysql --datadir=/var/lib/mysql &"
97
sleep 1
108
until mysqladmin ping -h localhost --silent; do
119
echo 'waiting for mysqld to be connectable...'

0 commit comments

Comments
 (0)