From db1a705b7eacce3986a2c91861b77a6b39fabcef Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Sun, 28 Jan 2024 19:35:29 +0100 Subject: [PATCH] feat: add mysqldump and configure connections on all environments --- .github/workflows/tests.yml | 5 +---- Dockerfile | 1 + doc/contributing.md | 4 ++-- docker-compose.yml | 2 -- tests/AppConfigMysqlUrl/config.yml | 2 +- tests/AppConfigPgsql/config.yml | 4 ++-- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1de59f03..5941fbee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,9 +46,7 @@ jobs: image: mysql:5.7 env: MYSQL_ROOT_PASSWORD: root - MYSQL_USER: root MYSQL_DATABASE: acme - MYSQL_HOST: mariadb ports: - 3306:3306 postgresql: @@ -69,8 +67,7 @@ jobs: steps: - name: Set up hosts file run: | - echo '127.0.0.1 mariadb' | sudo tee -a /etc/hosts - echo '127.0.0.1 postgres' | sudo tee -a /etc/hosts + echo '127.0.0.1 mariadb postgres' | sudo tee -a /etc/hosts - name: Install mysqldump run: | sudo apt install -y -q ${{ matrix.mysql-client }} diff --git a/Dockerfile b/Dockerfile index 8bc7e192..3df3410d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update \ libsqlite3-dev \ unzip \ wget \ + default-mysql-client \ && docker-php-ext-install \ pdo_mysql \ pdo_pgsql \ diff --git a/doc/contributing.md b/doc/contributing.md index 2b84f6c9..35467ad2 100644 --- a/doc/contributing.md +++ b/doc/contributing.md @@ -21,5 +21,5 @@ docker-compose exec php-fpm composer install Now you can execute the tests with the following command: ```bash -docker-compose exec php-fpm ./vendor/bin/phpunit -``` \ No newline at end of file +docker-compose exec php-fpm ./vendor/bin/phpunit --exclude-group "" +``` diff --git a/docker-compose.yml b/docker-compose.yml index 1e27c4ee..665919c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,6 @@ services: environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=acme - - MYSQL_USER=root - - MYSQL_PASSWORD=root ports: - '11003:3306' diff --git a/tests/AppConfigMysqlUrl/config.yml b/tests/AppConfigMysqlUrl/config.yml index 0cf71ad6..2cbdd85f 100644 --- a/tests/AppConfigMysqlUrl/config.yml +++ b/tests/AppConfigMysqlUrl/config.yml @@ -2,5 +2,5 @@ doctrine: dbal: - url: 'mysql://root:@127.0.0.1:3306/foobar' + url: 'mysql://root:root@mariadb:3306/foobar' driver: pdo_mysql diff --git a/tests/AppConfigPgsql/config.yml b/tests/AppConfigPgsql/config.yml index 194f2a21..21e362dc 100644 --- a/tests/AppConfigPgsql/config.yml +++ b/tests/AppConfigPgsql/config.yml @@ -6,5 +6,5 @@ doctrine: host: postgres port: 5432 dbname: postgres - user: root - password: root + user: postgres + password: postgres