zipusyan commited on
Commit
dbf3c5e
·
verified ·
1 Parent(s): f996995

Update entrypoint.sh

Browse files
Files changed (1) hide show
  1. entrypoint.sh +6 -2
entrypoint.sh CHANGED
@@ -28,13 +28,11 @@ if [ ! -f "$INIT_FLAG" ]; then
28
 
29
  mysql -u root --socket=/run/mysqld/mysqld.sock <<EOSQL
30
  FLUSH PRIVILEGES;
31
- ALTER USER 'root'@'localhost' IDENTIFIED BY '${DB_ROOT_PASSWORD}';
32
  CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '${DB_ROOT_PASSWORD}';
33
  GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
34
  CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
35
  CREATE USER IF NOT EXISTS '${DB_USER}'@'127.0.0.1' IDENTIFIED BY '${DB_PASSWORD}';
36
  GRANT ALL PRIVILEGES ON \`${DB_NAME}\`.* TO '${DB_USER}'@'127.0.0.1';
37
- FLUSH PRIVILEGES;
38
  EOSQL
39
 
40
  echo "=== Creating tables ==="
@@ -46,6 +44,12 @@ EOSQL
46
  mysql -u root --socket=/run/mysqld/mysqld.sock "${DB_NAME}" <<EOSQL
47
  REPLACE INTO \`${DB_PREFIX}config\` VALUES ('sys_key', '${SYS_KEY}');
48
  INSERT INTO \`${DB_PREFIX}user\` (\`username\`,\`password\`,\`level\`,\`regtime\`,\`lasttime\`,\`status\`) VALUES ('${ADMIN_USER}', '${ADMIN_HASH}', 2, NOW(), NOW(), 1);
 
 
 
 
 
 
49
  EOSQL
50
 
51
  kill $MYSQL_PID 2>/dev/null
 
28
 
29
  mysql -u root --socket=/run/mysqld/mysqld.sock <<EOSQL
30
  FLUSH PRIVILEGES;
 
31
  CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '${DB_ROOT_PASSWORD}';
32
  GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
33
  CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
34
  CREATE USER IF NOT EXISTS '${DB_USER}'@'127.0.0.1' IDENTIFIED BY '${DB_PASSWORD}';
35
  GRANT ALL PRIVILEGES ON \`${DB_NAME}\`.* TO '${DB_USER}'@'127.0.0.1';
 
36
  EOSQL
37
 
38
  echo "=== Creating tables ==="
 
44
  mysql -u root --socket=/run/mysqld/mysqld.sock "${DB_NAME}" <<EOSQL
45
  REPLACE INTO \`${DB_PREFIX}config\` VALUES ('sys_key', '${SYS_KEY}');
46
  INSERT INTO \`${DB_PREFIX}user\` (\`username\`,\`password\`,\`level\`,\`regtime\`,\`lasttime\`,\`status\`) VALUES ('${ADMIN_USER}', '${ADMIN_HASH}', 2, NOW(), NOW(), 1);
47
+ EOSQL
48
+
49
+ echo "=== Setting root password ==="
50
+ mysql -u root --socket=/run/mysqld/mysqld.sock <<EOSQL
51
+ ALTER USER 'root'@'localhost' IDENTIFIED BY '${DB_ROOT_PASSWORD}';
52
+ FLUSH PRIVILEGES;
53
  EOSQL
54
 
55
  kill $MYSQL_PID 2>/dev/null