improve docker, config

FIX migrations (tested on pqsql)

Author: akiraz2

.gitignore

@@ -35,3 +35,5 @@ phpunit.phar
 /.vagrant
 /node_modules
 /mysql/data
+
+.env

README.md

@@ -10,26 +10,26 @@ Please, [enable php intl extension](http://php.net/manual/en/intl.installation.p
 
 Default, the template includes three tiers: `frontend`, `backend`, and `console`, each of which is a separate Yii application.
 
-> **NOTE:** Template is in initial development. Anything may change at any time. 
+> **NOTE:** Template is in initial development. Anything may change at any time.
 
 
 ## Features
 * Gentelella Admin template is beautiful and simple bootstrap, compatible with yii2 assets: [yiister/yii2-gentelella](https://github.com/yiister/yii2-gentelella), [Demo](https://colorlib.com/polygon/gentelella/)
 * Yii2 User is strong and proved user-module with many features: [dektrium/yii2-user](https://github.com/dektrium/yii2-user) (login `adminus`, password `adminus`)
 * Frontend and Backend User Controllers are filtered (by `dektrium/yii2-user`)
-* DB cache, but I recommend Redis Cache - it is really fast
+* File or DB cache, but I recommend Redis Cache - it is really fast
 * Yii2 queue (DB table `queue`), but you can use *Redis-queue* or other [yii2-queue docs](https://github.com/yiisoft/yii2-queue/blob/master/docs/guide/README.md)
 * Queue Manager with backend (`/queuemanager/default/index`) using [ignatenkovnikita/yii2-queuemanager](https://github.com/ignatenkovnikita/yii2-queuemanager)
-* Log DB Target with backend (`/log/index`) - simply view log messages 
+* Log DB Target with backend (`/log/index`) - simply view log messages
 * .htaccess - config for **pretty urls** (rewrite index.php), *may be later add nginx config*
 * **UrlManagerFrontend** for backend app (all url rules in file `frontend/config/urls.php`, hostInfo in `common/config/params.php`)
 * i18n translations in `common/messages` with config (current only English and Russian, language translation are welcome!)
 * ContactForm in frontend app is improved: [himiklab/yii2-recaptcha-widget](https://github.com/himiklab/yii2-recaptcha-widget),
  all email are saved to DB (`common/models/EmailForm` Model), optionally send message to Viber messenger via bot
   (install requirements [Bogdaan/viber-bot-php](https://github.com/Bogdaan/viber-bot-php) and config, uncomment code in Model)
 * **postcss** config (`frontend/web/src/pcss//*.css`)
-* Gii generator: 
-1. added **yii2-queue** Jobs generator 
+* Gii generator:
+1. added **yii2-queue** Jobs generator
 2. yii2 migration generator (from existing table) [Insolita/yii2-migrik](https://github.com/Insolita/yii2-migrik)
 3. [schmunk42/yii2-giiant](https://github.com/schmunk42/yii2-giiant) - really steroid, but in development with bugs
 
@@ -97,14 +97,14 @@ Add your language in `common/messages/config.php`
         'ru-RU',
     ],
 ```
-In shell 
+In shell
 ```
 php yii message/extract common/messages/config.php
 ```
 
 **POSTCSS**
 
-> **NOTE:** Dont forget install nodejs :) and run command `npm install` if you want use post locally
+> **NOTE:** Dont forget install nodejs :) and run command `npm install` if you want use postcss locally
 
 Add WebStorm file-watcher, postcss.config.js is ready for use
 1. scope file[my-site]:frontend/web/src/pcss//*.css
@@ -128,4 +128,4 @@ I can apply patch, PR in 2-3 days! If not, please write me `akiraz@bk.ru`
 ## Licensing
 
 Yii2-App is released under the BSD License. See the bundled [LICENSE.md](LICENSE.md)
-for details. 
+for details.

common/config/main.php

@@ -23,8 +23,9 @@
             ]*/
         ],
         'cache' => [
-            'class' => yii\caching\DbCache::class,
-            'cacheTable' => '{{%cache}}',
+            'class' => yii\caching\FileCache::class,
+//            'class' => yii\caching\DbCache::class,
+//            'cacheTable' => '{{%cache}}',
             /*'class' => \yii\redis\Cache::class,
             'redis' => [
                 'hostname' => 'localhost',
@@ -64,15 +65,19 @@
             ],
         ],
         'queue' => [
-            'class' => \yii\queue\db\Queue::class,
-            'db' => 'db', // DB connection component or its config
-            'tableName' => '{{%queue}}', // Table name
-            'channel' => 'default', // Queue channel key
-            'mutex' => \yii\mutex\MysqlMutex::class, // Mutex used to sync queries
-            'as log' => \yii\queue\LogBehavior::class,
-            'as quuemanager' => \ignatenkovnikita\queuemanager\behaviors\QueueManagerBehavior::class
-            // Other driver options
+            'class' => \yii\queue\sync\Queue::class,
+            'handle' => false, // whether tasks should be executed immediately
         ],
+//        'queue' => [
+//            'class' => \yii\queue\db\Queue::class,
+//            'db' => 'db', // DB connection component or its config
+//            'tableName' => '{{%queue}}', // Table name
+//            'channel' => 'default', // Queue channel key
+//            'mutex' => \yii\mutex\MysqlMutex::class, // Mutex used to sync queries
+//            'as log' => \yii\queue\LogBehavior::class,
+//            'as quuemanager' => \ignatenkovnikita\queuemanager\behaviors\QueueManagerBehavior::class
+//            // Other driver options
+//        ],
     ],
     'modules' => [
         'user' => [

console/migrations/m180422_170849_create_email_form_table.php

@@ -5,20 +5,13 @@
 /**
  * Handles the creation of table `email_form`.
  */
-class m180422_170849_create_email_form_table extends Migration
+class m180422_170849_create_email_form_table extends \dektrium\user\migrations\Migration
 {
     /**
      * {@inheritdoc}
      */
     public function safeUp()
     {
-        $tableOptions = null;
-
-        if ($this->db->driverName === 'mysql') {
-            // http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci
-            $tableOptions = 'CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE=InnoDB';
-        }
-
         $this->createTable('{{%email_form}}', [
             'id' => $this->primaryKey(),
             'user_id' => $this->integer(11),
@@ -32,7 +25,7 @@ public function safeUp()
             'created_at' => $this->timestamp(),
             'status_text' => $this->text(),
             'send_at' => $this->dateTime()
-        ], $tableOptions);
+        ], $this->tableOptions);
     }
 
     /**

console/migrations/m180430_141650_cache.php

@@ -3,7 +3,7 @@
 use yii\db\Schema;
 use yii\db\Migration;
 
-class m180430_141650_cache extends Migration
+class m180430_141650_cache extends \dektrium\user\migrations\Migration
 {
 
     public function init()
@@ -14,13 +14,11 @@ public function init()
 
     public function safeUp()
     {
-        $tableOptions = 'ENGINE=InnoDB';
-
         $this->createTable('{{%cache}}',[
             'id'=> $this->char(128)->notNull(),
             'expire'=> $this->integer(11)->null()->defaultValue(null),
             'data'=> $this->binary()->null()->defaultValue(null),
-        ], $tableOptions);
+        ], $this->tableOptions);
 
         $this->addPrimaryKey('pk_on_cache','{{%cache}}',['id']);
     }

docker-compose.yml

@@ -6,9 +6,11 @@ services:
       context: 'nginx'
     ports:
       - '8100:80'
+      - '8200:81'
     volumes:
       # Application testing
       - ./frontend/web:/app/frontend/web:delegated
+      - ./backend/web:/app/backend/web:delegated
   php:
     build:
       dockerfile: Dockerfile-${DOCKERFILE_FLAVOUR}
@@ -26,13 +28,24 @@ services:
       - ~/.composer/cache:/root/.composer/cache:delegated
     links:
       - db
+#  db:
+#    image: mysql:5.7
+#    environment:
+#      MYSQL_ROOT_PASSWORD: root
+#      MYSQL_USER: username
+#      MYSQL_PASSWORD: password
+#      MYSQL_DATABASE: yii2advanced
+#      volumes:
+#        - ./mysql/data:/var/lib/mysql
+#        - ./mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+
   db:
-    image: mysql:5.7
+    image: postgres:13-alpine
     environment:
       MYSQL_ROOT_PASSWORD: root
-      MYSQL_USER: username
-      MYSQL_PASSWORD: password
-      MYSQL_DATABASE: dbname
+      POSTGRES_USER: username
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: yii2advanced
     volumes:
-      - ./mysql/data:/var/lib/mysql
+      - ./mysql/data:/var/lib/postgresql/data
       - ./mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d

environments/dev/backend/config/main-local.php

@@ -14,11 +14,13 @@
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = [
         'class' => 'yii\debug\Module',
+        'allowedIPs' => ['*']
     ];
 
     $config['bootstrap'][] = 'gii';
     $config['modules']['gii'] = [
         'class' => 'yii\gii\Module',
+        'allowedIPs' => ['*'],
         'generators' => [
             'job' => [
                 'class' => \yii\queue\gii\Generator::class,

environments/dev/common/config/main-local.php

@@ -3,9 +3,9 @@
     'components' => [
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'mysql:host=localhost;dbname=yii2advanced',
-            'username' => 'root',
-            'password' => '',
+            'dsn' => 'pgsql:host=db;dbname=yii2advanced',
+            'username' => 'username',
+            'password' => 'password',
             'charset' => 'utf8',
         ],
         'mailer' => [

environments/dev/frontend/config/main-local.php

@@ -14,11 +14,13 @@
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = [
         'class' => 'yii\debug\Module',
+        'allowedIPs' => ['*']
     ];
 
     $config['bootstrap'][] = 'gii';
     $config['modules']['gii'] = [
         'class' => 'yii\gii\Module',
+        'allowedIPs' => ['*']
     ];
 }
 

nginx/Dockerfile

@@ -1,2 +1,2 @@
-FROM nginx
+FROM nginx:1.19-alpine
 COPY nginx.conf /etc/nginx/nginx.conf

nginx/nginx.conf

@@ -71,5 +71,37 @@ http {
         }
     }
 
+    server {
+            charset utf-8;
+            client_max_body_size 512M;
+            server_name localhost;
+
+            listen 81;
+
+            root        /app/backend/web;
+            index       index.php;
+
+            location / {
+                # Redirect everything that isn't a real file to index.php
+                try_files $uri $uri/ /index.php?$args;
+            }
+
+            # uncomment to avoid processing of calls to non-existing static files by Yii
+            location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {
+                try_files $uri =404;
+            }
+
+            location ~ \.php$ {
+                include /etc/nginx/fastcgi_params;
+                fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+                fastcgi_pass php:9000;
+                try_files $uri =404;
+            }
+
+            location ~ /\.(ht|svn|git) {
+                deny all;
+            }
+        }
+
     include /etc/nginx/conf.d/*.conf;
 }

php/Dockerfile-debian

@@ -100,10 +100,10 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
     composer clear-cache
 
 # Install composer plugins
-RUN composer global require --optimize-autoloader \
-        "hirak/prestissimo:${VERSION_PRESTISSIMO_PLUGIN}" && \
-    composer global dumpautoload --optimize && \
-    composer clear-cache
+#RUN composer global require --optimize-autoloader \
+#        "hirak/prestissimo:${VERSION_PRESTISSIMO_PLUGIN}" && \
+#    composer global dumpautoload --optimize && \
+#    composer clear-cache
 
 # Enable mod_rewrite for images with apache
 RUN if command -v a2enmod >/dev/null 2>&1; then \