diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..f10b96e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '3.8'
+
+services:
+  backend:
+    build:
+      context: ./G12Project
+      dockerfile: Dockerfile
+      target: final
+    container_name: g12-backend
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_DATASOURCE_URL=jdbc:mysql://202.205.102.121:3306/g12develop
+      - SPRING_DATASOURCE_USERNAME=team12
+      - SPRING_DATASOURCE_PASSWORD=123456abc
+    restart: unless-stopped
+    networks:
+      - g12-network
+
+  frontend:
+    build:
+      context: ./G12-Frontend
+      dockerfile: Dockerfile
+    container_name: g12-frontend
+    ports:
+      - "80:80"
+    depends_on:
+      - backend
+    restart: unless-stopped
+    networks:
+      - g12-network
+
+networks:
+  g12-network:
+    driver: bridge 
\ No newline at end of file