From fd0226f420313597cd6b6b6cc1e8153581fd3a04 Mon Sep 17 00:00:00 2001
From: Benjamin Sherriff <ben.sherriff@blackcape.io>
Date: Fri, 6 Oct 2023 16:56:10 -0400
Subject: [PATCH] Updated dockerfile to use pipx

---
 service/Dockerfile | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/service/Dockerfile b/service/Dockerfile
index 4d10586..ff07a8b 100644
--- a/service/Dockerfile
+++ b/service/Dockerfile
@@ -11,35 +11,36 @@ COPY Cargo.toml ./
 RUN apt-get update && apt-get install -y cmake
 RUN cargo build --release
 
-# ==========
-#  Packages
-# ==========
-FROM debian:bullseye-slim as packages
-# FROM debian:bookworm-slim as packages
-WORKDIR /packages
+# # ==========
+# #  Packages
+# # ==========
+# FROM debian:bullseye-slim as packages
+# # FROM debian:bookworm-slim as packages
+# WORKDIR /packages
 
-RUN apt-get update && apt-get install -y curl tar xz-utils && \
-  # curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux > yt-dlp && \
-  curl -L https://github.com/yt-dlp/yt-dlp/releases/download/2023.07.06/yt-dlp_linux > yt-dlp && \
-  chmod +x yt-dlp && \
-  # curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz > ffmpeg.tar.xz && \
-  curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/autobuild-2023-06-30-14-08/ffmpeg-N-111310-g96d6990517-linux64-gpl.tar.xz > ffmpeg.tar.xz && \
-  tar -xJf ffmpeg.tar.xz --wildcards */bin/ffmpeg --transform='s/^.*\///' && rm ffmpeg.tar.xz
+# RUN apt-get update && apt-get install -y curl tar xz-utils && \
+#   curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux > yt-dlp && \
+#   # curl -L https://github.com/yt-dlp/yt-dlp/releases/download/2023.07.06/yt-dlp_linux > yt-dlp && \
+#   chmod +x yt-dlp && \
+#   curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz > ffmpeg.tar.xz && \
+#   # curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/autobuild-2023-06-30-14-08/ffmpeg-N-111310-g96d6990517-linux64-gpl.tar.xz > ffmpeg.tar.xz && \
+#   tar -xJf ffmpeg.tar.xz --wildcards */bin/ffmpeg --transform='s/^.*\///' && rm ffmpeg.tar.xz
 
 # =========
 #  Runtime
 # =========
-FROM debian:bullseye-slim as runtime
-# FROM debian:bookworm-slim as runtime
-# FROM rust:bookworm as runtime
+# FROM debian:bullseye-slim as runtime
+FROM debian:bookworm-slim as runtime
 WORKDIR /service
 USER root
 
 COPY --from=builder /builder/target/release/service /usr/local/bin/service
-COPY --from=packages /packages /usr/bin
+# COPY --from=packages /packages /usr/bin
 
-RUN apt-get update && apt-get install -y libpq5
-# RUN apt-get update && apt-get install -y libpq5 && \
-  # apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN apt-get update && apt-get install -y \
+  libc6 libc6-dev libopus-dev libpq5 libpq-dev python3-pip ffmpeg pipx
+  # apt-get auto-remove -y && \
+  # pip install -U yt-dlp
+RUN pipx install yt-dlp
 
 CMD ["service"]