From 9ec5afdc98003378e6136f602b4aecb5ee1efc96 Mon Sep 17 00:00:00 2001 From: Nathan Rashleigh Date: Sat, 16 Aug 2025 10:55:36 +1000 Subject: [PATCH] maple --- Cargo.toml | 2 +- compose.yaml | 15 +++++---------- etc/{run.sh => run_maple.sh} | 5 +++++ etc/sldl.tpl.conf | 2 +- justfile | 2 +- slskdecks.Dockerfile => maple.Dockerfile | 4 ++-- ...decks.sublime-project => maple.sublime-project | 0 maple.sublime-workspace | 1 + 8 files changed, 16 insertions(+), 15 deletions(-) rename etc/{run.sh => run_maple.sh} (92%) rename slskdecks.Dockerfile => maple.Dockerfile (88%) rename slskdecks.sublime-project => maple.sublime-project (100%) create mode 100644 maple.sublime-workspace diff --git a/Cargo.toml b/Cargo.toml index 8336880..80ed476 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "slskdecks" +name = "maple" version = "0.1.0" edition = "2024" diff --git a/compose.yaml b/compose.yaml index d879807..e915510 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,27 +1,22 @@ services: slskd: image: slskd/slskd - restart: always ports: - "5030:5030" - "5031:5031" - "50300:50300" - environment: - - SLSKD_REMOTE_CONFIGURATION=true volumes: - - ./data/shared:/app/data - - ./src:/app/src/ - - ./etc/:/app/etc/ + - ./data/slskd:/app/data - ./etc/slskd.yml:/app/slskd.yml - slskdecks: - image: registry.ntwl.xyz/slskdecks + maple: + image: registry.ntwl.xyz/maple build: context: . - dockerfile: slskdecks.Dockerfile + dockerfile: maple.Dockerfile env_file: .env volumes: - - ./data/shared:/app/data/shared + - ./data/maple:/data - ./src:/app/src/ - ./etc/:/app/etc/ diff --git a/etc/run.sh b/etc/run_maple.sh similarity index 92% rename from etc/run.sh rename to etc/run_maple.sh index b25f668..77bc854 100644 --- a/etc/run.sh +++ b/etc/run_maple.sh @@ -17,8 +17,13 @@ configure() { echo "--------------------------------------------------------------" } +start() { + sleep 100000 +} + main() { configure + start } main \ No newline at end of file diff --git a/etc/sldl.tpl.conf b/etc/sldl.tpl.conf index 08aab67..828a096 100644 --- a/etc/sldl.tpl.conf +++ b/etc/sldl.tpl.conf @@ -1,4 +1,4 @@ -[slskdecks] +path = "/data" username = "${SLDL_USER}" password = "${SLDL_PASS}" diff --git a/justfile b/justfile index d8596ee..2c1fb1a 100644 --- a/justfile +++ b/justfile @@ -18,4 +18,4 @@ exec CTR: dl TRG: docker compose -f compose.yaml run \ --remove-orphans \ - slskdecks -- sldl --user "${SLSK_USER}" --password "${SLSK_PW}" {{TRG}} + maple -- sldl {{TRG}} diff --git a/slskdecks.Dockerfile b/maple.Dockerfile similarity index 88% rename from slskdecks.Dockerfile rename to maple.Dockerfile index 1288daf..e5c1f1f 100644 --- a/slskdecks.Dockerfile +++ b/maple.Dockerfile @@ -1,4 +1,4 @@ -FROM denoland/deno:debian +FROM debian:bookworm ENV SLSK_BATCHDL_V "2.4.7" @@ -24,4 +24,4 @@ COPY ./etc/ /app/etc WORKDIR /app/ -CMD ["bash", "/app/etc/run.sh"] +CMD ["bash", "/app/etc/run_maple.sh"] diff --git a/slskdecks.sublime-project b/maple.sublime-project similarity index 100% rename from slskdecks.sublime-project rename to maple.sublime-project diff --git a/maple.sublime-workspace b/maple.sublime-workspace new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/maple.sublime-workspace @@ -0,0 +1 @@ +{} \ No newline at end of file