Skip to content

Commit

Permalink
Fix unlunch bug
Browse files Browse the repository at this point in the history
  • Loading branch information
nanofi committed Oct 29, 2015
1 parent 547a9d4 commit 91384e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ RUN \
mv dist/docker-mysql-linux-amd64 /usr/local/bin/docker-mysql && \
rm -rf dist

RUN usermod -u 1000 mysql

COPY . /app/
WORKDIR /app/

ENTRYPOINT []
CMD ["mysqld_safe", "--datadir=/var/lib/mysql", "--user=mysql"]
CMD ["forego", "start", "-r"]
3 changes: 2 additions & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ ! -d '/var/lib/mysql/mysql' -a "${1%_safe}" = 'mysqld' ]; then
exit 1
fi

mysql_install_db --user=mysql --datadir=/var/lib/mysql
mysqld --initialize --user=mysql --datadir=/var/lib/mysql

# These statements _must_ be on individual lines, and _must_ end with
# semicolons (no line breaks or comments are permitted).
Expand All @@ -24,6 +24,7 @@ if [ ! -d '/var/lib/mysql/mysql' -a "${1%_safe}" = 'mysqld' ]; then
echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE"

set -- "$@" --init-file="$TEMP_FILE"
ls -al /var/run/mysqld > /var/lib/mysql/ls-mydqld
fi

chown -R mysql:mysql /var/lib/mysql
Expand Down

0 comments on commit 91384e2

Please sign in to comment.