moved config to separate folder

Dockerfile

@@ -1,11 +1,12 @@
-FROM dmstr/php-yii2:7.1-fpm-3.1-alpine-nginx
+FROM yiisoftware/yii2-php:7.2-apache
 
 WORKDIR /app
 
 ADD composer.lock composer.json /app/
 RUN composer install --prefer-dist --optimize-autoloader
 
 ADD yii /app/
+ADD ./config /app/config
 ADD ./web /app/web/
 ADD ./src /app/src/
 RUN cp src/app.env-dist src/app.env

composer.json

@@ -3,19 +3,30 @@
     "minimum-stability": "stable",
     "require": {
         "vlucas/phpdotenv": "2.*",
-        "yiisoft/yii2": "^2.0.8",
+        "yiisoft/yii2": "^2.0.13",
         "yiisoft/yii2-bootstrap": "2.*",
         "yiisoft/yii2-debug": "2.*",
         "codemix/yii2-streamlog": "^1.0.0"
     },
-    "extra": {
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
-        },
-        "asset-vcs-driver-options": {
-            "github-no-api": true
-        },
-        "asset-pattern-skip-version": "(-build|-patch)"
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
+    "config": {
+        "fxp-asset": {
+            "enabled": false,
+            "installer-paths": {
+                "npm-asset-library": "vendor/npm",
+                "bower-asset-library": "vendor/bower"
+            },
+            "vcs-driver-options": {
+                "github-no-api": true
+            },
+            "git-skip-update": "2 days",
+            "pattern-skip-version": "(-build|-patch)",
+            "optimize-with-installed-packages": false
+        }
     }
 }

src/config/common.php → config/common.php

@@ -13,7 +13,7 @@
 return [
     'id' => 'app',
     'language' => 'en',
-    'basePath' => dirname(__DIR__),
+    'basePath' => dirname(__DIR__).'/src',
     'vendorPath' => '@app/../vendor',
     'runtimePath' => '@app/../runtime',
     // Bootstrapped modules are loaded in every request

src/config/env.php → config/env.php

@@ -14,7 +14,7 @@
 defined('APP_VERSION') or define('APP_VERSION', $version);
 
 // Load default settings via dotenv from file
-$dotenv = new Dotenv\Dotenv(__DIR__.'/..', 'app.env');
+$dotenv = new Dotenv\Dotenv(__DIR__, 'app.env');
 $dotenv->load();
 
 // Checks & validation

src/config/main.php → config/main.php

@@ -10,11 +10,11 @@
  */
 
 // Define application aliases
-Yii::setAlias('@app', dirname(__DIR__).'/..');
-Yii::setAlias('@root', '@app/..');
-Yii::setAlias('@runtime', dirname(__DIR__).'/../../runtime');
-Yii::setAlias('@web', dirname(__DIR__).'/../web');
-Yii::setAlias('@webroot', dirname(__DIR__).'/web');
+Yii::setAlias('@app', dirname(__DIR__).'/../src');
+Yii::setAlias('@root', '..');
+Yii::setAlias('@runtime', '@root/runtime');
+Yii::setAlias('@web', '@root/web');
+Yii::setAlias('@webroot', '/');
 
 // Load $merge configuration files
 $applicationType = php_sapi_name() == 'cli' ? 'console' : 'web';

docker-compose.dev.yml

@@ -3,12 +3,12 @@ services:
   php:
     build: .
     environment:
-      - PHP_USER_ID=82
-      - GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
+      - GITHUB_API_TOKEN
     volumes:
       - ./composer.json:/app/composer.json
       - ./composer.lock:/app/composer.lock
       - ./vendor:/app/vendor
+      - ./config:/app/config
       - ./src:/app/src
       - ./web:/app/web
       - ./tests:/app/tests