From 849b9bd75372d593995616474ca3cf0472c13f9a Mon Sep 17 00:00:00 2001
From: "m.marjorie" <anitomarjorie.02@gmail.com>
Date: Mon, 24 Mar 2025 08:29:58 +0000
Subject: [PATCH] Update Dockerfile, docker-compose.yml, and nginx/default.conf
 on VM

---
 Dockerfile         |  0
 docker-compose.yml | 66 +++++++++++++++++++++-------------------------
 nginx/default.conf |  0
 3 files changed, 30 insertions(+), 36 deletions(-)
 mode change 100644 => 100755 Dockerfile
 mode change 100644 => 100755 docker-compose.yml
 mode change 100644 => 100755 nginx/default.conf

diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index c04a6e9..b52c3c7
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,70 +1,64 @@
 version: '3.8'
 
 services:
-  # MySQL Database
-  db:
+  mysql:
     image: mysql:8.0
-    container_name: laravel-mysql
-    restart: unless-stopped
+    container_name: mysql
     environment:
+      MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: laravel
-      MYSQL_ROOT_PASSWORD: root_password
-      MYSQL_USER: laravel_user
-      MYSQL_PASSWORD: laravel_password
+      MYSQL_USER: laravel
+      MYSQL_PASSWORD: secret
     volumes:
-      - mysql_data:/var/lib/mysql
-    ports:
-      - "3306:3306"
+      - mysql-data:/var/lib/mysql
     networks:
-      - laravel-network
+      - app-network
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       interval: 10s
       timeout: 5s
       retries: 5
-      start_period: 30s
+    restart: unless-stopped
 
-  # Laravel Application
-  app:
+  laravel:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: laravel-app
-    restart: unless-stopped
-    volumes:
-      - ./src:/var/www/html
+    container_name: laravel
+    user: "1000:1000"  # Match the host user's UID:GID
     depends_on:
-      db:
+      mysql:
         condition: service_healthy
+    volumes:
+      - .:/var/www/html
     networks:
-      - laravel-network
+      - app-network
     healthcheck:
-      test: ["CMD", "php", "-v"]
+      test: ["CMD", "php", "--version"]
       interval: 10s
       timeout: 5s
       retries: 5
-    command: >
-       sh -c "php-fpm"
-
-  # Nginx Web Server
-  web:
-    image: nginx:alpine
-    container_name: laravel-nginx
+    command: ["/var/www/html/start.sh"]
     restart: unless-stopped
+
+  nginx:
+    image: nginx:alpine
+    container_name: nginx
+    depends_on:
+      laravel:
+        condition: service_healthy
     ports:
       - "80:80"
     volumes:
-      - ./src:/var/www/html
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    depends_on:
-      app:
-        condition: service_healthy
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+      - .:/var/www/html
     networks:
-      - laravel-network
+      - app-network
+    restart: unless-stopped
 
 networks:
-  laravel-network:
+  app-network:
     driver: bridge
 
 volumes:
-  mysql_data:
+  mysql-data:
diff --git a/nginx/default.conf b/nginx/default.conf
old mode 100644
new mode 100755