From cf7e63d9df6aed5fedf15df33f4e1ea0743f68d5 Mon Sep 17 00:00:00 2001
From: Khoa Vo <vndangkhoa@gmail.com>
Date: Fri, 20 Mar 2026 21:30:01 +0700
Subject: [PATCH] Fix docker-compose.yml merge conflict

---
 Dockerfile         |  2 +-
 docker-compose.yml | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2a6496..17ebdba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV NODE_ENV=production
 RUN npm run build
 
 # Stage 2: Build Backend (Rust)
-FROM rust:1.75-alpine AS backend-builder
+FROM rust:1.85-alpine AS backend-builder
 WORKDIR /app/backend
 
 RUN apk add --no-cache musl-dev openssl-dev perl
diff --git a/docker-compose.yml b/docker-compose.yml
index 85207d6..2f53c9f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,24 +1,14 @@
 services:
   spotify-clone:
-<<<<<<< HEAD
     image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v3
-=======
-    image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v5
->>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
     container_name: spotify-clone
     restart: unless-stopped
     ports:
       - "3110:8080"
     environment:
       - PORT=8080
-<<<<<<< HEAD
     volumes:
       - ./data:/tmp/spotify-clone-downloads
-=======
-      - RUST_ENV=production
-    volumes:
-      - ./data:/app/data
->>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
       - ./cache:/tmp/spotify-clone-cache
     logging:
       driver: "json-file"