Fix Rust edition for Docker build compatibility
This commit is contained in:
parent
7fe5b955e8
commit
b1318a854b
4 changed files with 28 additions and 13 deletions
|
|
@ -1,10 +1,15 @@
|
||||||
|
node_modules/
|
||||||
node_modules
|
dist/
|
||||||
dist
|
.git/
|
||||||
.git
|
.gitignore
|
||||||
.env
|
.env
|
||||||
.DS_Store
|
.DS_Store
|
||||||
backend.log
|
*.log
|
||||||
ngrok.log
|
*.pid
|
||||||
backend-go/server.exe
|
frontend.pid
|
||||||
backend-go/server
|
backend.pid
|
||||||
|
nul
|
||||||
|
backend-go/
|
||||||
|
data/
|
||||||
|
cache/
|
||||||
|
backend-rust/target/
|
||||||
|
|
|
||||||
4
backend-rust/Cargo.lock
generated
4
backend-rust/Cargo.lock
generated
|
|
@ -289,9 +289,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itoa"
|
name = "itoa"
|
||||||
version = "1.0.17"
|
version = "1.0.18"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
|
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "backend-rust"
|
name = "backend-rust"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2021"
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "backend-rust"
|
name = "backend-rust"
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,24 @@
|
||||||
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"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue