vndangkhoa/spotify-clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix docker-compose.yml merge conflict

Browse source
This commit is contained in:
Khoa Vo 2026-03-20 21:30:01 +07:00
parent b1318a854b
commit cf7e63d9df
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -10,7 +10,7 @@ ENV NODE_ENV=production
RUN npm run build RUN npm run build
# Stage 2: Build Backend (Rust) # Stage 2: Build Backend (Rust)
FROM rust:1.75-alpine AS backend-builder FROM rust:1.85-alpine AS backend-builder
WORKDIR /app/backend WORKDIR /app/backend
RUN apk add --no-cache musl-dev openssl-dev perl RUN apk add --no-cache musl-dev openssl-dev perl

10
docker-compose.yml
View file

@ -1,24 +1,14 @@
services: services:
spotify-clone: spotify-clone:
<<<<<<< HEAD
image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v3 image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v3
=======
image: git.khoavo.myds.me/vndangkhoa/spotify-clone:v5
>>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
container_name: spotify-clone container_name: spotify-clone
restart: unless-stopped restart: unless-stopped
ports: ports:
- "3110:8080" - "3110:8080"
environment: environment:
- PORT=8080 - PORT=8080
<<<<<<< HEAD
volumes: volumes:
- ./data:/tmp/spotify-clone-downloads - ./data:/tmp/spotify-clone-downloads
=======
- RUST_ENV=production
volumes:
- ./data:/app/data
>>>>>>> 35c9bf24f7d451c1b2717bbb9c221b29980dbc83
- ./cache:/tmp/spotify-clone-cache - ./cache:/tmp/spotify-clone-cache
logging: logging:
driver: "json-file" driver: "json-file"