diff --git a/Dockerfile b/Dockerfile index cd9be6c..2db908f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,5 +41,6 @@ RUN uv tool install instaloader \ && uv tool install yt-dlp[default] \ && yt-dlp --version +WORKDIR /app COPY --from=builder-rs /app/target/release/tg-relay-rs /usr/local/bin/tg-relay-rs CMD ["/usr/local/bin/tg-relay-rs"] diff --git a/docker-compose.yml b/docker-compose.yml index b24963b..c531164 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,8 +8,9 @@ services: environment: TELOXIDE_TOKEN: ${TELOXIDE_TOKEN} COOKIES_PATH: ${COOKIES_PATH:-/app/yt-cookies.txt} + COOKIES: ${COOKIES:-false} RUST_LOG: ${RUST_LOG:-info} restart: unless-stopped volumes: - ./comments.txt:/app/comments.txt:ro - - /etc/secrets/yt-cookies.txt:/app/yt-cookies.txt + - /etc/secrets/yt-cookies.txt:/app/yt-cookies.txt:ro diff --git a/src/download.rs b/src/download.rs index d22dbd0..bc11624 100644 --- a/src/download.rs +++ b/src/download.rs @@ -144,7 +144,11 @@ pub async fn download_ytdlp(url: &str, cookies: Option<&str>) -> Result() + .unwrap_or(false); + if with_cookies && let Some(cookie_path) = cookies { if Path::new(cookie_path).exists() { args.extend(["--cookies", cookie_path]); } else {