Skip to content

Increase the 30 seconds check #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Increase the 30 seconds check #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ea9253
Update docker-entrypoint.sh
shantanuo Apr 6, 2016
0edea88
Update docker-entrypoint.sh
shantanuo Apr 6, 2016
cd1e958
Update Dockerfile
shantanuo Dec 26, 2016
207929f
Update Dockerfile
shantanuo Dec 26, 2016
041370a
Update Dockerfile
shantanuo Jan 29, 2017
5ded20b
added volume
shantanuo Jan 29, 2017
08bfd65
Update Dockerfile
shantanuo Jan 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 5.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion 5.5/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion 5.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down