diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index b346078..7595f12 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -1,6 +1,7 @@ \ No newline at end of file +?> diff --git a/bootstrap/dotenv.php b/bootstrap/dotenv.php new file mode 100644 index 0000000..799a5b1 --- /dev/null +++ b/bootstrap/dotenv.php @@ -0,0 +1,12 @@ +isDir() or $file->getExtension() != 'env') { + continue; + } + $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); + $env->load(); +} diff --git a/composer.json b/composer.json index 62af58a..f32275b 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "php-di/slim-bridge": "dev-master", "rubellum/slim-blade-view": "dev-master", "nyholm/psr7": "1.4.x-dev", - "nyholm/psr7-server": "dev-master" + "nyholm/psr7-server": "dev-master", + "vlucas/phpdotenv": "5.3.x-dev" }, "require-dev" : { "phpunit/phpunit" : "^6.3", diff --git a/docker-compose.yml b/docker-compose.yml index ba91d4a..df1c290 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,8 +13,6 @@ services: php: build: . container_name: php - ports: - - 9123:9000 volumes: - .:/code @@ -22,13 +20,7 @@ services: container_name: db image: mariadb:latest restart: unless-stopped - ports: - - 3307:3306 - environment: - MYSQL_ROOT_PASSWORD: 'password' - MYSQL_DATABASE: 'incoviba' - MYSQL_USER: 'incoviba' - MYSQL_PASSWORD: '5GQYFvRjVw2A4KcD' + env_file: .db.env volumes: - dbdata:/var/lib/mysql @@ -37,10 +29,8 @@ services: image: adminer:latest restart: unless-stopped ports: - - 8082:8080 - environment: - ADMINER_DESIGN: 'dracula' - ADMINER_PLUGINS: 'dump-json' + - 8083:8080 + env_file: .adminer.env volumes: dbdata: