Skip to content

Commit 56895c7

Browse files
committed
Update environment variables and dependencies for development setup
1 parent 0411008 commit 56895c7

4 files changed

Lines changed: 120 additions & 42 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@
1616
.DS_Store
1717
.vagrant
1818
.phpunit.result.cache
19+
.env
20+
.env.dist

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
],
4949
"require": {
5050
"php": "^8.1",
51-
"phplist/core": "dev-main",
52-
"phplist/rest-api": "dev-main",
53-
"phplist/web-frontend": "dev-main",
51+
"phplist/core": "dev-env",
52+
"phplist/rest-api": "dev-env",
53+
"phplist/web-frontend": "dev-env",
5454
"doctrine/orm": "^3.3",
5555
"tatevikgr/rest-api-client": "dev-main",
5656
"tatevikgr/rss-feed": "dev-main as 0.1.0",
@@ -92,6 +92,7 @@
9292
"PhpList\\Core\\Composer\\ScriptHandler::createBundleConfiguration",
9393
"PhpList\\Core\\Composer\\ScriptHandler::createRoutesConfiguration",
9494
"PhpList\\Core\\Composer\\ScriptHandler::createParametersConfiguration",
95+
"PhpList\\Core\\Composer\\ScriptHandler::createDotenvConfiguration",
9596
"php bin/console cache:clear",
9697
"php bin/console cache:warmup"
9798
],

composer.lock

Lines changed: 112 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ services:
1414
PHPLIST_DATABASE_DRIVER: ${PHPLIST_DATABASE_DRIVER:-pdo_mysql} # pdo_pgsql
1515
PHPLIST_DATABASE_HOST: ${PHPLIST_DATABASE_HOST:-db} # postgres
1616
PHPLIST_DATABASE_PORT: ${PHPLIST_DATABASE_PORT:-3306} # 5432
17-
REST_API_BASE_URL: 'http://app:8081/'
18-
FRONT_END_BASE_URL: 'http://app:8081/'
19-
API_BASE_URL: 'http://app:8081/'
17+
FRONT_END_BASE_URL: ${FRONT_END_BASE_URL:-http://localhost:${PHPLIST_PORT:-8081}/}
18+
API_BASE_URL: ${API_BASE_URL:-http://localhost:${PHPLIST_PORT:-8081}/}
2019

2120
# Symfony environment
2221
APP_ENV: prod

0 commit comments

Comments
 (0)