瀏覽代碼

use integration credentials

Piotr Kwiecinski 4 年之前
父節點
當前提交
b61965f2d6
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      compose/bin/setup-integration-tests

+ 3 - 2
compose/bin/setup-integration-tests

@@ -4,14 +4,15 @@ source env/db.env
 MYSQL_INTEGRATION_CONFIG=dev/tests/integration/etc/install-config-mysql.php
 
 # If database doesn't exist create it and add user permissions
-bin/clinotty mysql -h${MYSQL_INTEGRATION_HOST} -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_INTEGRATION_DATABASE} -e exit &> /dev/null || 
+bin/clinotty mysql -h${MYSQL_INTEGRATION_HOST} -uroot -p${MYSQL_ROOT_PASSWORD} ${MYSQL_INTEGRATION_DATABASE} -e exit &> /dev/null ||
   bin/clinotty mysqladmin -h${MYSQL_INTEGRATION_HOST} -uroot -p${MYSQL_ROOT_PASSWORD} create ${MYSQL_INTEGRATION_DATABASE} &&
   echo "Database ${MYSQL_INTEGRATION_DATABASE} created." &&
   bin/cli mysql -uroot -p${MYSQL_ROOT_PASSWORD} -h${MYSQL_INTEGRATION_HOST} \
     -e "GRANT ALL PRIVILEGES ON ${MYSQL_INTEGRATION_DATABASE}.* TO '${MYSQL_INTEGRATION_USER}'@'%';FLUSH PRIVILEGES;"
 
 sed -e "s/'db-host' => 'localhost'/'db-host' => '${MYSQL_INTEGRATION_HOST}'/" \
-  -e "s/'db-password' => '123123q'/'db-password' => '${MYSQL_ROOT_PASSWORD}'/" \
+  -e "s/'db-user' => 'root'/'db-user' => '${MYSQL_INTEGRATION_USER}'/" \
+  -e "s/'db-password' => '123123q'/'db-password' => '${MYSQL_INTEGRATION_PASSWORD}'/" \
   -e "s/'amqp-host' => 'localhost'/'amqp-host' => 'rabbitmq'/" \
   -e "s/'elasticsearch-host' => 'localhost'/'elasticsearch-host' => 'elasticsearch'/" \
   src/${MYSQL_INTEGRATION_CONFIG}.dist > src/${MYSQL_INTEGRATION_CONFIG}