From 4541caf1f7225c1e1a25477858105470f01eaafa Mon Sep 17 00:00:00 2001
From: Ale <ale.tasistro@gmail.com>
Date: Sun, 31 Aug 2025 21:44:46 -0300
Subject: [PATCH] docker-compose.yml adaptado a prod y agregado
 docker-compose.dev.yml para desarrollo

---
 docker-compose.dev.yml | 76 ++++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml     | 32 ++++++++++--------
 2 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 docker-compose.dev.yml

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000..6292d8f
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,76 @@
+version: '3.2'
+
+services:
+  app:
+    build:
+      args:
+        user: www
+        uid: ${USERID}
+      context: ./
+      dockerfile: Dockerfile
+    image: laravel-image
+    container_name: pedi2-app
+    restart: unless-stopped
+    working_dir: /var/www/
+    volumes:
+      - ./:/var/www
+      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+    networks:
+      - app-network
+
+  vite:
+    build:
+      args:
+        user: www
+        uid: ${USERID}
+      context: ./
+    container_name: vite
+    working_dir: /var/www
+    command: npm run dev
+    volumes:
+      - ./:/var/www
+    ports:
+      - "5173:5173"
+    networks:
+      - app-network
+
+  db:
+    image: mysql:5.7
+    container_name: pedi2-db
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: ${DB_DATABASE}
+      MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
+      MYSQL_PASSWORD: ${DB_PASSWORD}
+      MYSQL_USER: ${DB_USERNAME}
+      SERVICE_TAGS: dev
+      SERVICE_NAME: mysql
+    volumes:
+      - ./mysql/my.cnf:/etc/mysql/my.cnf
+      - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
+      - dbdata:/var/lib/mysql
+    networks:
+      - app-network
+    ports:
+      - ${DB_PORT_EXPOSED}:3306
+
+  nginx:
+    image: nginx:alpine
+    container_name: pedi2-nginx
+    restart: unless-stopped
+    ports:
+      - ${NGINX_PORT}:80
+    volumes:
+      - ./:/var/www
+      - ./nginx/conf.d/:/etc/nginx/conf.d/
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
+
+#Volumes
+volumes:
+  dbdata:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 6292d8f..856ea16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,27 +8,24 @@ services:
         uid: ${USERID}
       context: ./
       dockerfile: Dockerfile
-    image: laravel-image
+    image: pedi2-server
     container_name: pedi2-app
     restart: unless-stopped
     working_dir: /var/www/
     volumes:
-      - ./:/var/www
-      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+      - server-storage:/var/www/storage
+      - server-public:/var/www/public
+      - server-root:/var/www
+#      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
     networks:
       - app-network
 
   vite:
-    build:
-      args:
-        user: www
-        uid: ${USERID}
-      context: ./
-    container_name: vite
-    working_dir: /var/www
+    image: pedi2-server
+#    working_dir: /var/www
     command: npm run dev
     volumes:
-      - ./:/var/www
+      - server-public:/var/www/public
     ports:
       - "5173:5173"
     networks:
@@ -46,8 +43,7 @@ services:
       SERVICE_TAGS: dev
       SERVICE_NAME: mysql
     volumes:
-      - ./mysql/my.cnf:/etc/mysql/my.cnf
-      - ./mysql/docker-entrypoint-initdb.d/:/docker-entrypoint-initdb.d/
+#      - ./mysql/my.cnf:/etc/mysql/my.cnf
       - dbdata:/var/lib/mysql
     networks:
       - app-network
@@ -61,7 +57,9 @@ services:
     ports:
       - ${NGINX_PORT}:80
     volumes:
-      - ./:/var/www
+      - server-storage:/var/www/storage
+      - server-public:/var/www/public
+      - server-root:/var/www
       - ./nginx/conf.d/:/etc/nginx/conf.d/
     networks:
       - app-network
@@ -72,5 +70,11 @@ networks:
 
 #Volumes
 volumes:
+  server-root:
+    driver: local
+  server-storage:
+    driver: local
+  server-public:
+    driver: local
   dbdata:
     driver: local