From b8ebbb36d6eef6f155b157570fd1c88eec51a0e4 Mon Sep 17 00:00:00 2001 From: Jose134 Date: Sun, 2 Feb 2025 01:43:43 +0100 Subject: [PATCH] Install czkawka via download in dockerfile + fix uvicorn dependency --- .gitignore | 6 +----- Dockerfile | 10 +++++----- requirements.txt | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c76fa4f..efa407c 100644 --- a/.gitignore +++ b/.gitignore @@ -159,8 +159,4 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ - - -vendor/czkawka/* -vendor/ffmpeg/* \ No newline at end of file +#.idea/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4bb6c45..0b82b92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,11 @@ RUN pip install gunicorn # Copy the FastAPI project files into the container COPY . . -# Copy the czkawka binary into the container -COPY vendor/czkawka /bin/ - -# Install ffmpeg with ffprobe -RUN apt-get update && apt-get install -y ffmpeg +# Install binary dependencies +RUN apt-get update && apt-get install -y wget ffmpeg +RUN wget -O /usr/local/bin/czkawka https://github.com/qarmin/czkawka/releases/download/8.0.0/linux_czkawka_cli +RUN chmod +x /usr/local/bin/czkawka +RUN apt-remove wget # Expose the port the app runs on EXPOSE 8000 diff --git a/requirements.txt b/requirements.txt index 49e0235..d858690 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ requests fastapi +uvicorn pytest ; extra == 'dev' \ No newline at end of file