fix config
This commit is contained in:
parent
3393b15d64
commit
2cac6ee127
1
.env
1
.env
|
|
@ -6,6 +6,7 @@ DOTDOT_TAG=master
|
|||
LMS_TAG=master
|
||||
HELP_TAG=master
|
||||
|
||||
PHP_SOCKER_HOST=ws
|
||||
PHP_SOCKET_PORT=8080
|
||||
|
||||
MYSQL_PORT=0.0.0.0:3306
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ server {
|
|||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_set_header Host $host;
|
||||
proxy_pass http://ws:8080/;
|
||||
proxy_pass http://php:8080/;
|
||||
}
|
||||
|
||||
location @rewriteapp {
|
||||
|
|
@ -119,7 +119,7 @@ server {
|
|||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
|
||||
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
|
||||
|
||||
fastcgi_pass php:9001;
|
||||
fastcgi_pass backend:9001;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||
include fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ server {
|
|||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_set_header Host $host;
|
||||
proxy_pass http://ws:8080/;
|
||||
proxy_pass http://php:8080/;
|
||||
}
|
||||
|
||||
location @rewriteapp {
|
||||
|
|
@ -116,7 +116,7 @@ server {
|
|||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
|
||||
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
|
||||
|
||||
fastcgi_pass php:9001;
|
||||
fastcgi_pass backend:9001;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||
include fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,21 @@ volumes:
|
|||
redis_volume:
|
||||
|
||||
|
||||
x-defaults-php: &defaults-php
|
||||
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./configs/php/.env:/application/.env
|
||||
- ./configs/php/.env.local:/application/.env.local
|
||||
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
- php_var_volume:/application/var
|
||||
- ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
|
||||
depends_on:
|
||||
- db
|
||||
- rabbitmq
|
||||
networks:
|
||||
- dd
|
||||
|
||||
networks:
|
||||
dd:
|
||||
name: ${NETWORK}
|
||||
|
|
@ -45,66 +60,22 @@ services:
|
|||
networks:
|
||||
- dd
|
||||
|
||||
php:
|
||||
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
|
||||
backend:
|
||||
<<: *defaults-php
|
||||
# command: "php-fpm && nginx -g 'daemon off;'"
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./configs/php/.env:/application/.env
|
||||
- ./configs/php/.env.local:/application/.env.local
|
||||
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
- php_var_volume:/application/var
|
||||
- ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
|
||||
depends_on:
|
||||
- db
|
||||
networks:
|
||||
- dd
|
||||
|
||||
php:
|
||||
# TODO: Денис должен переделать и добавить
|
||||
command: ./bin/console app:auction:reload
|
||||
<<: *defaults-php
|
||||
|
||||
carrier-offers:
|
||||
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
|
||||
<<: *defaults-php
|
||||
command: ./bin/console messenger:consume CarrierOffers
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./configs/php/.env:/application/.env
|
||||
- ./configs/php/.env.local:/application/.env.local
|
||||
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
- php_var_volume:/application/var
|
||||
- ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
|
||||
depends_on:
|
||||
- db
|
||||
- rabbitmq
|
||||
networks:
|
||||
- dd
|
||||
|
||||
auction:
|
||||
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
|
||||
<<: *defaults-php
|
||||
command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done'
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./configs/php/.env:/application/.env
|
||||
- ./configs/php/.env.local:/application/.env.local
|
||||
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
- php_var_volume:/application/var
|
||||
- ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
|
||||
depends_on:
|
||||
- db
|
||||
networks:
|
||||
- dd
|
||||
|
||||
ws:
|
||||
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
|
||||
command: ./bin/console app:auction:reload
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./configs/php/.env:/application/.env
|
||||
- ./configs/php/.env.local:/application/.env.local
|
||||
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
|
||||
- php_var_volume:/application/var
|
||||
- ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json
|
||||
depends_on:
|
||||
- db
|
||||
networks:
|
||||
- dd
|
||||
|
||||
lms:
|
||||
image: registry.dot-dot.ru/lms:${LMS_TAG}
|
||||
|
|
|
|||
Loading…
Reference in New Issue