From 8ea9253c5c22ff072f9d9fd7a3a7dbc42b8fba1b Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Wed, 6 Apr 2016 11:51:29 +0530 Subject: [PATCH 1/7] Update docker-entrypoint.sh --- 5.5/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index 81144fc12..06bbddac1 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 {180..0}; do if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then break fi From 0edea88c0f895ba4261fc9841fed9b7b7ee5313d Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Wed, 6 Apr 2016 11:57:34 +0530 Subject: [PATCH 2/7] Update docker-entrypoint.sh --- 5.5/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5.5/docker-entrypoint.sh b/5.5/docker-entrypoint.sh index 06bbddac1..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 {180..0}; do + for i in {181..0}; do if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then break fi From cd1e95853e40036568f1aede8a4d1f82b76d434e Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Mon, 26 Dec 2016 15:52:39 +0530 Subject: [PATCH 3/7] Update Dockerfile --- 5.7/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/5.7/Dockerfile b/5.7/Dockerfile index 7fa529982..cbf987c13 100644 --- a/5.7/Dockerfile +++ b/5.7/Dockerfile @@ -37,8 +37,6 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \ && echo 'skip-host-cache\nskip-name-resolve' | awk '{ print } $1 == "[mysqld]" && c == 0 { c = 1; system("cat") }' /etc/mysql/my.cnf > /tmp/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"] From 207929f5ae9d7f2cd4152a55392fc569a36421a5 Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Mon, 26 Dec 2016 17:17:09 +0530 Subject: [PATCH 4/7] Update Dockerfile --- 5.5/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 2835afe7a..a1bf3d2d0 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -51,7 +51,6 @@ RUN mkdir -p /etc/mysql/conf.d \ echo '!includedir /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 From 041370ac8cac27ad8f2cc7da72cf2515b688fa0d Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Sun, 29 Jan 2017 19:07:38 +0530 Subject: [PATCH 5/7] Update Dockerfile --- 5.5/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index a1bf3d2d0..7256945ea 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -51,7 +51,7 @@ RUN mkdir -p /etc/mysql/conf.d \ echo '!includedir /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"] From 5ded20b1c1377681d83b87506088941b815357e5 Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Sun, 29 Jan 2017 19:08:08 +0530 Subject: [PATCH 6/7] added volume --- 5.7/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/5.7/Dockerfile b/5.7/Dockerfile index cbf987c13..379e19a47 100644 --- a/5.7/Dockerfile +++ b/5.7/Dockerfile @@ -37,6 +37,7 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \ && echo 'skip-host-cache\nskip-name-resolve' | awk '{ print } $1 == "[mysqld]" && c == 0 { c = 1; system("cat") }' /etc/mysql/my.cnf > /tmp/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"] From 08bfd65ebd774bc0c03811927b5ae2014626f70f Mon Sep 17 00:00:00 2001 From: Shantanu Oak Date: Sun, 29 Jan 2017 19:14:14 +0530 Subject: [PATCH 7/7] Update Dockerfile --- 5.5/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 7256945ea..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