From 91384e24b9b5cbe4e9b72152a04dca6df3f27354 Mon Sep 17 00:00:00 2001 From: nanofi Date: Fri, 30 Oct 2015 02:36:36 +0900 Subject: [PATCH] Fix unlunch bug --- Dockerfile | 3 --- start.sh | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1bcee90..bd70a83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/start.sh b/start.sh index d0d38b1..10e1966 100755 --- a/start.sh +++ b/start.sh @@ -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). @@ -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