Стабильный билд docker-compose

diff --git a/README.md b/README.md
index c1c3f16d09ae702d9e23a518ca0307952764cb1a..1d68d771bf659451ee251392f14e31f7990e7ce7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ docker compose exec php composer -o dump-autoload
 docker compose exec php mkdir /www/web/uploads
 docker compose exec php chmod -R 777 /www/web/uploads
 
-docker compose run --no-deps --rm node npm install
-docker compose up -d node
+docker compose run --no-deps --rm node-yii_erp24 npm install
+docker compose up -d node-yii_erp24
 
 gzip -d -c erp24.sql.gz | docker compose exec -T db mysql -proot_password erp24 
 ```

diff --git a/docker-compose.yml b/docker-compose.yml
index 59b87a12c85401360634ba1b542f4140d71ccd41..d25d589e35da5f891b69c2a0a11e535c75405625 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 version: '2'
 services:
-  nginx:
+  nginx-yii_erp24:
     build: ./docker/nginx
     restart: always
     ports:
@@ -9,7 +9,7 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx/conf:/etc/nginx
-  nginx_api2:
+  nginx_api2-yii_erp24:
     build: ./docker/nginx_api2
     restart: always
     ports:
@@ -18,7 +18,7 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx_api2/conf:/etc/nginx
-  nginx_api3:
+  nginx_api3-yii_erp24:
     build: ./docker/nginx_api3
     restart: always
     ports:
@@ -26,7 +26,7 @@ services:
     volumes:
       - ./erp24:/www
       - ./docker/nginx_api3/conf:/etc/nginx
-  php:
+  php-yii_erp24:
     build: ./docker/php
     restart: always
     extra_hosts:
@@ -37,10 +37,9 @@ services:
       MODE: 'dev'
     volumes:
       - ./erp24:/www
-      - ./docker/php/conf/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
       - ./docker/php/conf/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - ./docker/php/conf/php.ini:/usr/local/etc/php/php.ini
-  db:
+  db-yii_erp24:
     build: ./docker/db
     restart: always
     command: --default-authentication-plugin=mysql_native_password
@@ -50,7 +49,7 @@ services:
       - docker/db/dev.db.env
     volumes:
       - mysqldata:/var/lib/mysql
-  phpmyadmin:
+  phpmyadmin-yii_erp24:
     image: phpmyadmin
     restart: always
     ports:
@@ -60,9 +59,30 @@ services:
     volumes:
       #php loads files alphabetically, add "zz-" to override settings
       - ./docker/phpmyadmin/conf/zz-phpmyadmin.ini:/usr/local/etc/php/conf.d/zz-phpmyadmin.ini
-  node:
+
+  db-pgsql-yii_erp24:
+    image: postgres:12.17
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgsqldata:/var/lib/postgresql
+    env_file: ./docker/db/dev.db-pgsql.env
+
+  pgadmin-yii_erp24:
+    image: dpage/pgadmin4
+    ports:
+      - "5050:80"
+    env_file: ./docker/db/dev.db-pgsql.env
+
+  #  pgloader-mysql-yii_erp24:
+  #    image: dimitri/pgloader:ccl.latest
+  #    volumes:
+  #      - "./docker/pgloader/config:/loader"
+  #    command: pgloader mysql://root:root_password@db/erp24 postgresql://root:root@db-pgsql:5432/erp24
+
+  node-yii_erp24:
     image: node:18.4.0-alpine3.15
-    restart: always
+    #restart: always
     volumes:
       - ./erp24:/www:rw
     working_dir: /www
@@ -71,4 +91,5 @@ services:
     command: npm run dev
 
 volumes:
-    mysqldata:
+  mysqldata:
+  pgsqldata:

diff --git a/docker/db/dev.db-pgsql.env b/docker/db/dev.db-pgsql.env
new file mode 100644 (file)
index 0000000..02b040b
--- /dev/null
+++ b/docker/db/dev.db-pgsql.env
@@ -0,0 +1,5 @@
+POSTGRES_USER=root
+POSTGRES_PASSWORD=root
+PGADMIN_DEFAULT_EMAIL=admin@admin.com
+PGADMIN_DEFAULT_PASSWORD=admin
+POSTGRES_DB=erp24
\ No newline at end of file

diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf
index 97d125b0ce73490a1debcfd9675c4feeffbf9e3f..8baaa7200919e40ffbf1cecdf9e663b11e2e3f2b 100644 (file)
--- a/docker/nginx/conf/nginx.conf
+++ b/docker/nginx/conf/nginx.conf
@@ -36,7 +36,7 @@ http {
           root        /www/web;
         }
         location / {
-            fastcgi_pass   php:9000;
+            fastcgi_pass   php-yii_erp24:9000;
             fastcgi_param  SCRIPT_FILENAME  /www/web/index.php;
             include        fastcgi_params;
             fastcgi_read_timeout 300;
@@ -60,7 +60,7 @@ http {
           root        /www/web;
         }
         location / {
-            fastcgi_pass   php:9000;
+            fastcgi_pass   php-yii_erp24:9000;
             fastcgi_param  SCRIPT_FILENAME  /www/web/index.php;
             include        fastcgi_params;
         }

diff --git a/docker/nginx_api2/conf/nginx.conf b/docker/nginx_api2/conf/nginx.conf
index b4d384ed757a5a856142c85f4ddcf568210ec198..b91dbdc6fa48ca018ddea0b939b06783e1953ddd 100644 (file)
--- a/docker/nginx_api2/conf/nginx.conf
+++ b/docker/nginx_api2/conf/nginx.conf
@@ -36,7 +36,7 @@ http {
           root        /www/api2;
         }
         location / {
-            fastcgi_pass   php:9000;
+            fastcgi_pass   php-yii_erp24:9000;
             fastcgi_param  SCRIPT_FILENAME  /www/api2/index.php;
             include        fastcgi_params;
             fastcgi_read_timeout 300;
@@ -60,7 +60,7 @@ http {
           root        /www/api2;
         }
         location / {
-            fastcgi_pass   php:9000;
+            fastcgi_pass   php-yii_erp24:9000;
             fastcgi_param  SCRIPT_FILENAME  /www/api2/index.php;
             include        fastcgi_params;
         }

diff --git a/docker/nginx_api3/conf/nginx.conf b/docker/nginx_api3/conf/nginx.conf
index 82fd803275efc93fc59bbd035c5006f7b20e4778..7ea0c1385987d300372fc5e7ef8ab1b333b035d4 100644 (file)
--- a/docker/nginx_api3/conf/nginx.conf
+++ b/docker/nginx_api3/conf/nginx.conf
@@ -39,7 +39,7 @@ http {
           root        /www/api3/web;
         }
         location / {
-            fastcgi_pass   php:9000;
+            fastcgi_pass   php-yii_erp24:9000;
             include        fastcgi_params;
             fastcgi_param  SCRIPT_FILENAME  /www/api3/web/index.php;
             fastcgi_read_timeout 300;

diff --git a/docker/php/dev.php.env b/docker/php/dev.php.env
index 7dac8862a7dc2f467872bd6d493a783c2e23108b..612ba7807a4110e4f6e2b7dacfeb8da4c296c8ca 100644 (file)
--- a/docker/php/dev.php.env
+++ b/docker/php/dev.php.env
@@ -1,4 +1,4 @@
-DB_HOST = db
+DB_HOST = db-yii_erp24
 DB_SCHEMA = erp24
 DB_USER = bazacvetov24
 DB_PASSWORD = JVJruro_Xdg456o3ir