From: Aleksey Filippov Date: Mon, 19 Jan 2026 09:59:24 +0000 (+0300) Subject: conflict X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=2e8d1de0c799c4d8d0befea5a9ea2a92bd034614;p=erp24_rep%2Fyii-erp24%2F.git conflict --- diff --git a/docker/db/dev.db-pgsql.env b/docker/db/dev.db-pgsql.env deleted file mode 100644 index 2eef57cc..00000000 --- a/docker/db/dev.db-pgsql.env +++ /dev/null @@ -1,9 +0,0 @@ -POSTGRES_USER=root -POSTGRES_PASSWORD=root -PGADMIN_DEFAULT_EMAIL=admin@admin.com -PGADMIN_DEFAULT_PASSWORD=admin -POSTGRES_DB=erp24 -POSTGRES_HOSTNAME=db-pgsql-yii_erp24 -POSTGRES_PORT=5432 -POSTGRES_SCHEMA=erp24 -PGTZ=Europe/Moscow diff --git a/docker/db/dev.db-pgsql_before.env b/docker/db/dev.db-pgsql_before.env new file mode 100644 index 00000000..2eef57cc --- /dev/null +++ b/docker/db/dev.db-pgsql_before.env @@ -0,0 +1,9 @@ +POSTGRES_USER=root +POSTGRES_PASSWORD=root +PGADMIN_DEFAULT_EMAIL=admin@admin.com +PGADMIN_DEFAULT_PASSWORD=admin +POSTGRES_DB=erp24 +POSTGRES_HOSTNAME=db-pgsql-yii_erp24 +POSTGRES_PORT=5432 +POSTGRES_SCHEMA=erp24 +PGTZ=Europe/Moscow diff --git a/docker/php/dev.php.before.env b/docker/php/dev.php.before.env new file mode 100644 index 00000000..fffaf9fe --- /dev/null +++ b/docker/php/dev.php.before.env @@ -0,0 +1,9 @@ +DB_HOST = db-yii_erp24 +DB_SCHEMA = erp24 +DB_USER = bazacvetov24 +DB_PASSWORD = JVJruro_Xdg456o3ir + +XDEBUG_MODE=debug +XDEBUG_SESSION=PHPSTORM +APP_ENV=development +RABBIT_HOST=rabbitmq-yii_erp24 \ No newline at end of file diff --git a/docker/php/dev.php.env b/docker/php/dev.php.env deleted file mode 100644 index fffaf9fe..00000000 --- a/docker/php/dev.php.env +++ /dev/null @@ -1,9 +0,0 @@ -DB_HOST = db-yii_erp24 -DB_SCHEMA = erp24 -DB_USER = bazacvetov24 -DB_PASSWORD = JVJruro_Xdg456o3ir - -XDEBUG_MODE=debug -XDEBUG_SESSION=PHPSTORM -APP_ENV=development -RABBIT_HOST=rabbitmq-yii_erp24 \ No newline at end of file