Skip to content

Commit 4e50d68

Browse files
committed
Tweak debian entrypoint
1 parent 82e369d commit 4e50d68

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

bin/update_dockerfile.pl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,23 +1528,21 @@ sub load_prereqs {
15281528
source ~/.bash_profile
15291529
% }
15301530
1531-
% if ($type =~ /^(?:trusty|bionic)$/) {
1532-
find /var/lib/mysql -type f | xargs touch
1533-
% } elsif ($type =~ /^(?:buster|jessie)$/) {
1531+
% if ($type =~ /^(?:buster)$/) {
15341532
chown -R mysql:mysql /var/lib/mysql
15351533
% }
1536-
% if ($conf->{repo}{mysql84}) {
1534+
% if ($conf->{repo}{mysql84} or $type =~ /^(?:questing|plucky)$/) {
15371535
bash -c "cd /usr; mysqld --datadir='/var/lib/mysql' --user=mysql &"
15381536
15391537
sleep 1
15401538
until mysqladmin ping -h localhost --silent; do
15411539
echo 'waiting for mysqld to be connectable...'
15421540
sleep 1
15431541
done
1544-
% } elsif ($type =~ /sid|bookworm|bullseye/) {
1545-
service mariadb start
1546-
% } else {
1542+
% } elsif ($type =~ /buster/) {
15471543
service mysql start
1544+
% } else {
1545+
service mariadb start
15481546
% }
15491547
service memcached start
15501548

0 commit comments

Comments
 (0)