From c898bcf1d4c33efb2b8b44247ff3bdf17271f066 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 10 Feb 2023 06:42:07 +0000 Subject: [PATCH] Integrate docker to main page --- api/nginx.conf | 2 +- docker-compose.yml | 57 ++++++++++++++++++++++++++++------------------ ui/nginx.conf | 2 +- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/api/nginx.conf b/api/nginx.conf index 9f1a5ca..d4901bf 100644 --- a/api/nginx.conf +++ b/api/nginx.conf @@ -18,7 +18,7 @@ server { location ~ \.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass backend:9000; + fastcgi_pass operadores-backend:9000; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/docker-compose.yml b/docker-compose.yml index 0e448f8..9c4b16f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,53 +1,61 @@ version: '3' services: - backend-proxy: - container_name: backend_proxy + operadores-backend-proxy: + profiles: + - operadores + container_name: operadores_api image: nginx volumes: - - ./api/:/app/ - - ./api/nginx.conf:/etc/nginx/conf.d/default.conf - - ./logs/api/:/var/log/nginx/ + - ${OPERADORES_PATH:-.}/api/:/app/ + - ${OPERADORES_PATH:-.}/api/nginx.conf:/etc/nginx/conf.d/default.conf + - ./logs/operadores/api/:/var/log/nginx/ restart: unless-stopped ports: - 8001:80 depends_on: - - backend - backend: - container_name: backend + - operadores-backend + operadores-backend: + profiles: + - operadores + container_name: operadores_backend restart: unless-stopped image: php build: - context: ./api + context: ${OPERADROES_PATH:-.}/api dockerfile: PHP.Dockerfile - env_file: .db.env + env_file: ${OPERADORES_PATH:-.}/.db.env volumes: - - ./api/:/app/ + - ${OPERADORES_PATH:-.}/api/:/app/ # depends_on: # - db - frontend-proxy: - container_name: frontend_proxy + operadores-frontend-proxy: + profiles: + - operadores + container_name: operadores_ui image: nginx volumes: - - ./ui/:/app/ - - ./ui/nginx.conf:/etc/nginx/conf.d/default.conf - - ./logs/ui/:/var/log/nginx/ + - ${OPERADORES_PATH:-.}/ui/:/app/ + - ${OPERADORES_PATH:-.}/ui/nginx.conf:/etc/nginx/conf.d/default.conf + - ./logs/operadores/ui/:/var/log/nginx/ restart: unless-stopped ports: - 8000:80 depends_on: - - frontend - frontend: - container_name: frontend + - operadores-frontend + operadores-frontend: + profiles: + - operadores + container_name: operadores_frontend restart: unless-stopped image: php:ui build: - context: ./ui + context: ${OPERADORES_PATH:-.}/ui dockerfile: PHP.Dockerfile - env_file: .ui.env + env_file: ${OPERADORES_PATH:-.}/.ui.env volumes: - - ./ui/:/app/ + - ${OPERADORES_PATH:-.}/ui/:/app/ # # db: # image: mariadb @@ -68,3 +76,8 @@ services: # #volumes: # database: + +networks: + default: + external: true + name: incoviba_network diff --git a/ui/nginx.conf b/ui/nginx.conf index 84c68da..f1cd9cd 100644 --- a/ui/nginx.conf +++ b/ui/nginx.conf @@ -13,7 +13,7 @@ server { location ~ \.php$ { try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass frontend:9000; + fastcgi_pass operadores-frontend:9000; fastcgi_index index.php; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;