update docker

Author: maingocthanhtan96

.env.test.example

@@ -16,3 +16,4 @@ yarn-error.log
 .vscode
 .DS_Store
 /docker/.env
+/docker/logs

.gitignore

@@ -24,7 +24,7 @@ stages:
 unit_test:
   stage: test
   script:
-    - cp .env.test.example .env
+    - cp .env.example .env
 #    - composer install --ignore-platform-reqs --no-dev --optimize-autoloader --no-ansi --no-interaction --no-progress
 #    - php artisan key:generate
 #    - php artisan migrate

.gitlab-ci_tmp.yml

@@ -68,6 +68,11 @@ git clone https://github.com/maingocthanhtan96/LaraJS.git
 https://graphviz.org/download/ #(install graphviz)
 php artisan generate:erd public/images/diagram-erd.png
 
+# Run docker
+cd docker
+cp .env.example .env
+docker-compose up -d
+
 # Run bash script to install project (recommend)
 chmod u+x setup.sh && ./setup.sh
 

README.md

@@ -35,7 +35,7 @@ private function generate($fields, $model): void
         $templateData = str_replace('{{LIMIT}}', $model['limit'], $templateData);
         $templateData = str_replace('{{COLUMN_SEARCH}}', '[' . $this->generateColumnSearch($fields) . ']', $templateData);
         $templateData = str_replace('{{COLUMN_RELATIONSHIP}}', '[]', $templateData);
-        $templateData = str_replace('{{MODAL_CLASS_PARAM}}', \Str::camel($model['name']), $templateData);
+        $templateData = str_replace('{{MODAL_CLASS_PARAM}}', \Str::camel(\Str::singular($model['name'])), $templateData);
 
         $fileName = $model['name'] . 'Controller.php';
         $this->serviceFile->createFile($this->path, $fileName, $templateData);

app/Generators/Backend/ControllerGenerator.php

@@ -62,7 +62,7 @@ public function generateFields($fields): string
                         $fieldsGenerate[] = "'" . $field['field_name'] . "'" . ' => $faker->randomElement(' . json_encode($field['enum']) . '),';
                         break;
                     case $dbType['json']:
-                        $fieldsGenerate[] = "'" . $field['field_name'] . "'" . ' => "[{}],"';
+                        $fieldsGenerate[] = "'" . $field['field_name'] . "'" . ' => "[{}]",';
                         break;
                     case $dbType['file']:
                         $fieldsGenerate[] = "'" . $field['field_name'] . "'" . ' => json_encode(["https://via.placeholder.com/350"]),';

app/Generators/Backend/SeederGenerator.php

@@ -26,12 +26,10 @@ RUN touch /var/log/messages
 COPY logrotate/nginx /etc/logrotate.d/
 
 # Set upstream conf and remove the default conf
-RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf \
-    && rm /etc/nginx/conf.d/default.conf
-
+RUN rm /etc/nginx/conf.d/default.conf
 
 ADD ./startup.sh /opt/startup.sh
 RUN sed -i 's/\r//g' /opt/startup.sh
 CMD ["/bin/bash", "/opt/startup.sh"]
 
-EXPOSE 80 443
+EXPOSE 80 81 443

docker-compose.yml

@@ -1,4 +1,4 @@
-lluser www-data;
+user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
 daemon off;

docker/logs/nginx/app_access.log

@@ -19,7 +19,7 @@ server {
 
     location ~ \.php$ {
         try_files $uri /index.php =404;
-        fastcgi_pass php-upstream;
+        fastcgi_pass app:9000;
         fastcgi_index index.php;
         fastcgi_buffers 16 16k;
         fastcgi_buffer_size 32k;

docker/logs/nginx/app_error.log

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:7.4-fpm
 
 LABEL maintainer="[email protected]"
 
@@ -37,9 +37,9 @@ COPY ../../ /var/www
 
 # Add crontab
 USER root
-COPY ./php-fpm/app-entrypoint.sh /
+COPY ./app-entrypoint.sh /
 # Add crontab file in the cron directory
-COPY ./php-fpm/crontab /etc/cron.d
+COPY ./crontab /etc/cron.d
 # Give execution rights on the cron job
 RUN chmod -R 644 /etc/cron.d