From 54390807ae616a11e90f13764924440a7e112a37 Mon Sep 17 00:00:00 2001 From: "Alex. Plokhikh" Date: Thu, 18 Apr 2024 16:31:00 +0500 Subject: [PATCH 1/2] STA-958|add env database params --- .gitignore | 1 + app/.env | 4 +++- docker/docker-compose.yml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/app/.env b/app/.env index f00e606..c6d7fb4 100644 --- a/app/.env +++ b/app/.env @@ -26,7 +26,9 @@ APP_SECRET=397fa37eb874a2d47f2cac19e2f8802a # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4" -DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" +DATABASE_URL="postgresql://db:5432/db?serverVersion=16&charset=utf8" +DATABASE_USER="root" +DATABASE_PASSWORD="root" ###< doctrine/doctrine-bundle ### ###> symfony/messenger ### diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e529552..3b3b271 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,8 +4,8 @@ services: db: image: postgres:16.2 environment: - POSTGRES_PASSWORD: 'root' - POSTGRES_USER: 'root' + POSTGRES_PASSWORD: ${DATABASE_PASSWORD} + POSTGRES_USER: ${DATABASE_USER} networks: - app ports: -- GitLab From 832a9f7e4911a2099b44f76c85db7c97b42752d0 Mon Sep 17 00:00:00 2001 From: "Alex. Plokhikh" Date: Fri, 19 Apr 2024 14:08:14 +0500 Subject: [PATCH 2/2] STA-958|rm env & rm .idea & add .env.example --- .idea/.gitignore | 8 - .idea/iqdevTranningProgram.iml | 141 ---------------- .idea/modules.xml | 8 - .idea/php.xml | 158 ------------------ .idea/phpunit.xml | 10 -- .../0e61f67641b441bb3ee38e903c594d99cafa14b4 | 2 - .../11fc5ee351c0edf973b3158acd40705a072901f7 | 0 .../7c103dcd8c0314a8821f84f7886754511983a720 | 2 - .../dacdf19231dacf48f340f1ddb51182a025c0e074 | 0 .idea/sonarlint/issuestore/index.pb | 11 -- .../0e61f67641b441bb3ee38e903c594d99cafa14b4 | 0 .../11fc5ee351c0edf973b3158acd40705a072901f7 | 0 .../7c103dcd8c0314a8821f84f7886754511983a720 | 0 .../dacdf19231dacf48f340f1ddb51182a025c0e074 | 0 .idea/sonarlint/securityhotspotstore/index.pb | 11 -- .idea/symfony2.xml | 7 - .idea/vcs.xml | 6 - app/{.env => .env.example} | 2 - app/.gitignore | 1 + 19 files changed, 1 insertion(+), 366 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/iqdevTranningProgram.iml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/phpunit.xml delete mode 100644 .idea/sonarlint/issuestore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 delete mode 100644 .idea/sonarlint/issuestore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 delete mode 100644 .idea/sonarlint/issuestore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 delete mode 100644 .idea/sonarlint/issuestore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 delete mode 100644 .idea/sonarlint/issuestore/index.pb delete mode 100644 .idea/sonarlint/securityhotspotstore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 delete mode 100644 .idea/sonarlint/securityhotspotstore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 delete mode 100644 .idea/sonarlint/securityhotspotstore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 delete mode 100644 .idea/sonarlint/securityhotspotstore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 delete mode 100644 .idea/sonarlint/securityhotspotstore/index.pb delete mode 100644 .idea/symfony2.xml delete mode 100644 .idea/vcs.xml rename app/{.env => .env.example} (97%) diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/iqdevTranningProgram.iml b/.idea/iqdevTranningProgram.iml deleted file mode 100644 index 54d8720..0000000 --- a/.idea/iqdevTranningProgram.iml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index aedf51d..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 762b2df..0000000 --- a/.idea/php.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml deleted file mode 100644 index 4f8104c..0000000 --- a/.idea/phpunit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 b/.idea/sonarlint/issuestore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 deleted file mode 100644 index ef18277..0000000 --- a/.idea/sonarlint/issuestore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 +++ /dev/null @@ -1,2 +0,0 @@ - -f php:S4833"QReplace "require_once" with namespace import mechanism through the "use" keyword.(úÕ§ò \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 b/.idea/sonarlint/issuestore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/issuestore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 b/.idea/sonarlint/issuestore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 deleted file mode 100644 index 49baffe..0000000 --- a/.idea/sonarlint/issuestore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 +++ /dev/null @@ -1,2 +0,0 @@ - -Œphp:S112"FDefine and throw a dedicated exception instead of using a generic one.(÷¾Þ–ýÿÿÿÿ8¼Èñýë1J$639b0b04-18e2-4d6f-b884-25955f0cf69c \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 b/.idea/sonarlint/issuestore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb deleted file mode 100644 index 952c8a6..0000000 --- a/.idea/sonarlint/issuestore/index.pb +++ /dev/null @@ -1,11 +0,0 @@ - -_ -/src/Controller/ReadFileLineByLineController.php,1/1/11fc5ee351c0edf973b3158acd40705a072901f7 -F -public/HelloWorld.html,d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 -@ -public/index.php,0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 -_ -/src/Repository/ReadFileLineByLineRepository.php,7/c/7c103dcd8c0314a8821f84f7886754511983a720 -X -(src/Actions/ReadFileLineByLineAction.php,b/b/bb599184d4f741824c29e585018cdb8069747a80 \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 b/.idea/sonarlint/securityhotspotstore/0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/securityhotspotstore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 b/.idea/sonarlint/securityhotspotstore/1/1/11fc5ee351c0edf973b3158acd40705a072901f7 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/securityhotspotstore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 b/.idea/sonarlint/securityhotspotstore/7/c/7c103dcd8c0314a8821f84f7886754511983a720 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/securityhotspotstore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 b/.idea/sonarlint/securityhotspotstore/d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb deleted file mode 100644 index 952c8a6..0000000 --- a/.idea/sonarlint/securityhotspotstore/index.pb +++ /dev/null @@ -1,11 +0,0 @@ - -_ -/src/Controller/ReadFileLineByLineController.php,1/1/11fc5ee351c0edf973b3158acd40705a072901f7 -F -public/HelloWorld.html,d/a/dacdf19231dacf48f340f1ddb51182a025c0e074 -@ -public/index.php,0/e/0e61f67641b441bb3ee38e903c594d99cafa14b4 -_ -/src/Repository/ReadFileLineByLineRepository.php,7/c/7c103dcd8c0314a8821f84f7886754511983a720 -X -(src/Actions/ReadFileLineByLineAction.php,b/b/bb599184d4f741824c29e585018cdb8069747a80 \ No newline at end of file diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml deleted file mode 100644 index 3298060..0000000 --- a/.idea/symfony2.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/.env b/app/.env.example similarity index 97% rename from app/.env rename to app/.env.example index c6d7fb4..004ad49 100644 --- a/app/.env +++ b/app/.env.example @@ -27,8 +27,6 @@ APP_SECRET=397fa37eb874a2d47f2cac19e2f8802a # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4" DATABASE_URL="postgresql://db:5432/db?serverVersion=16&charset=utf8" -DATABASE_USER="root" -DATABASE_PASSWORD="root" ###< doctrine/doctrine-bundle ### ###> symfony/messenger ### diff --git a/app/.gitignore b/app/.gitignore index 09ca950..102c570 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1,5 +1,6 @@ ###> symfony/framework-bundle ### +/.env /.env.local /.env.local.php /.env.*.local -- GitLab