diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 2835afe7a..a121355d8 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -1,5 +1,6 @@ FROM debian:jessie + # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added RUN groupadd -r mysql && useradd -r -g mysql mysql @@ -52,7 +53,6 @@ RUN mkdir -p /etc/mysql/conf.d \ } > /etc/mysql/my.cnf VOLUME /var/lib/mysql - COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"] diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index 81144fc12..3e45e0da7 100755 --- a/5.5/docker-entrypoint.sh +++ b/5.5/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then mysql=( mysql --protocol=socket -uroot ) - for i in {30..0}; do + for i in {181..0}; do if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then break fi diff --git a/5.7/Dockerfile b/5.7/Dockerfile index 7fa529982..379e19a47 100644 --- a/5.7/Dockerfile +++ b/5.7/Dockerfile @@ -38,7 +38,6 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \ && mv /tmp/my.cnf /etc/mysql/my.cnf VOLUME /var/lib/mysql - COPY docker-entrypoint.sh /usr/local/bin/ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"]