From e4328d86046660190fbb9320de5e33919fd3f9c9 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 11 Oct 2023 09:00:00 -0300 Subject: [PATCH] Reorder docker --- adminer-compose.yml | 15 +++++++++++++++ docker-compose.yml | 20 ++++---------------- nginx.conf | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 adminer-compose.yml diff --git a/adminer-compose.yml b/adminer-compose.yml new file mode 100644 index 0000000..5f877dc --- /dev/null +++ b/adminer-compose.yml @@ -0,0 +1,15 @@ +services: + adminer: + profiles: + - db + container_name: incoviba_adminer + image: adminer + restart: unless-stopped + env_file: ${APP_PATH:-.}/.adminer.env + networks: + - adminer_network + ports: + - "8083:8080" + +networks: + adminer_network: {} diff --git a/docker-compose.yml b/docker-compose.yml index 58ae7bc..88027bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,11 +4,11 @@ x-restart: &restart restart: unless-stopped services: - web: + proxy: profiles: - app image: nginx:alpine - container_name: incoviba_web + container_name: incoviba_proxy <<: *restart ports: - "${APP_PORT}:80" @@ -17,11 +17,11 @@ services: - ./nginx.conf:/etc/nginx/conf.d/default.conf - ./logs/proxy:/logs - php: + web: profiles: - app build: . - container_name: incoviba_php + container_name: incoviba_web <<: *restart env_file: - ${APP_PATH:-.}/.env @@ -45,18 +45,6 @@ services: - default - adminer_network - adminer: - profiles: - - db - image: adminer:latest - container_name: incoviba_adminer - <<: *restart - env_file: ${APP_PATH:-.}/.adminer.env - networks: - - adminer_network - ports: - - "8083:8080" - python: profiles: - python diff --git a/nginx.conf b/nginx.conf index dfbee25..fc138fb 100644 --- a/nginx.conf +++ b/nginx.conf @@ -18,6 +18,6 @@ server { fastcgi_param SCRIPT_NAME $fastcgi_script_name; fastcgi_index index.php; fastcgi_read_timeout 3600; - fastcgi_pass php:9000; + fastcgi_pass web:9000; } }