Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FFMPEG missing from Dockerfile #48

Merged
merged 16 commits into from
Feb 1, 2025
Merged

Fix FFMPEG missing from Dockerfile #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3059045
Try using an ffmpeg image
sneakycrow Jan 31, 2025
a3f423e
Fix tag
sneakycrow Jan 31, 2025
0e38855
Change out image
sneakycrow Jan 31, 2025
cfaaf77
Try copying binary from source build
sneakycrow Jan 31, 2025
a55f5bc
Try a different location
sneakycrow Jan 31, 2025
2d91968
Try adding just a where ffmpeg command
sneakycrow Jan 31, 2025
1854062
Fix exec
sneakycrow Jan 31, 2025
cb61d16
Anotha one
sneakycrow Jan 31, 2025
b3a82ec
Anotha one
sneakycrow Jan 31, 2025
8fa786d
Anotha one
sneakycrow Jan 31, 2025
db65411
Fix queue location
sneakycrow Jan 31, 2025
8375bba
hail mary copy ffmprobe
sneakycrow Jan 31, 2025
e883952
Add debug command
sneakycrow Jan 31, 2025
a1ad38b
Add vod debug logs
sneakycrow Jan 31, 2025
a3e1df5
Try changing the entrypoint
sneakycrow Feb 1, 2025
56745b4
Define ffmpeg location
sneakycrow Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/queue.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
cargo build --release -p forge && \
cp /app/target/release/forge /usr/local/bin/forge


# Runtime stage
FROM --platform=$TARGETPLATFORM debian:bullseye-slim
FROM jrottenberg/ffmpeg:7.1-ubuntu2404-edge

# Install runtime dependencies
RUN apt-get update && apt-get install -y \
ca-certificates \
ffmpeg \
libpq5 \
&& rm -rf /var/lib/apt/lists/*

Expand Down
3 changes: 2 additions & 1 deletion k8s/base/queue/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: ConfigMap
metadata:
name: farmhand-queue-config
data:
RUST_LOG: "api=debug,db=debug,queue=debug,tower_http=debug,axum::rejection=trace"
RUST_LOG: "api=debug,db=debug,queue=debug,vod=debug,tower_http=debug,axum::rejection=trace"
STORAGE: "videos/staging"
UPLOAD_BUCKET: "farmhand"
FFMPEG_LOCATION: "/usr/local/bin/ffmpeg"
1 change: 1 addition & 0 deletions packages/vod/src/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ impl Quality {

impl HLSConverter {
fn get_video_dimensions(&self, input_path: &Path) -> Result<(u32, u32)> {
debug!("Getting dimensions for {:?}", input_path);
let output = Command::new(&self.ffmpeg_path)
.arg("-i")
.arg(input_path)
Expand Down
Loading