Add ffmpeg

Dockerfile

@@ -1,54 +1,65 @@
-FROM semibit/render-farm:latest
-
-# Install required packages including Xvfb
-USER root
-RUN apt-get update && \
-    apt-get install -y \
-      bash \
-      git git-lfs \
-      wget curl procps \
-      htop vim nano \
-      xvfb x11-utils && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install nginx
-RUN apt-get update && apt-get install -y nginx wget && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Expose ports
-EXPOSE 7860 3000 8083
-RUN mkdir /app || true
-RUN chown 1000 /app
-
-COPY --chown=1000 . /app
-COPY --chown=1000 package.ci.json /app/package.json
-
-# Ensure writable directories
-RUN mkdir -p /app/public /app/out /app/frames /app/uploads || true
-RUN chmod -R 777 /app/public /app/out /app/uploads /app/frames || true
-RUN chmod 777 /app/index.html || true
-RUN mkdir -p /tmp/client_body /tmp/proxy_temp /tmp/fastcgi_temp /tmp/uwsgi_temp /tmp/scgi_temp  && chmod -R 777 /tmp || true
-RUN chmod -R 777 /var || true
-RUN chmod -R 777 /app/node_modules/.cache || true
-
-# Build app
-WORKDIR /app
-
-# RUN npm run bundle || true
-# RUN npm run skip-font-warn || true
-
-# Copy nginx config and start script
-COPY --chown=1000 nginx.conf /etc/nginx/nginx.conf
-COPY --chown=1000 start.sh /app/start.sh
-RUN chmod +x /app/start.sh
-
-# Ensure nginx runs as root
-RUN sed -i 's/^user .*;/user root;/' /etc/nginx/nginx.conf || true
-
-# Set up Xvfb virtual display environment variable
-ENV DISPLAY=:99
-
-# Start Xvfb and then your app
-USER 1000
-
-CMD ["sh", "/app/start.sh"]
-
+FROM semibit/render-farm:latest
+
+# Install required packages including Xvfb
+USER root
+RUN apt-get update && \
+    apt-get install -y \
+      bash \
+      git git-lfs \
+      wget curl procps \
+      htop vim nano \
+      xvfb x11-utils && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install FFmpeg 8 from static build
+RUN wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz && \
+    tar -xf ffmpeg-release-amd64-static.tar.xz && \
+    mv ffmpeg-*-amd64-static/ffmpeg /usr/local/bin/ffmpeg && \
+    mv ffmpeg-*-amd64-static/ffprobe /usr/local/bin/ffprobe && \
+    chmod +x /usr/local/bin/ffmpeg /usr/local/bin/ffprobe && \
+    rm -rf ffmpeg-* && \
+    ln -sf /usr/local/bin/ffmpeg /usr/bin/ffmpeg && \
+    ln -sf /usr/local/bin/ffprobe /usr/bin/ffprobe && \
+    ffmpeg -version
+
+# Install nginx
+RUN apt-get update && apt-get install -y nginx wget && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Expose ports
+EXPOSE 7860 3000 8083
+RUN mkdir /app || true
+RUN chown 1000 /app
+
+COPY --chown=1000 . /app
+COPY --chown=1000 package.ci.json /app/package.json
+
+# Ensure writable directories
+RUN mkdir -p /app/public /app/out /app/frames /app/uploads || true
+RUN chmod -R 777 /app/public /app/out /app/uploads /app/frames || true
+RUN chmod 777 /app/index.html || true
+RUN mkdir -p /tmp/client_body /tmp/proxy_temp /tmp/fastcgi_temp /tmp/uwsgi_temp /tmp/scgi_temp  && chmod -R 777 /tmp || true
+RUN chmod -R 777 /var || true
+RUN chmod -R 777 /app/node_modules/.cache || true
+
+# Build app
+WORKDIR /app
+
+# RUN npm run bundle || true
+# RUN npm run skip-font-warn || true
+
+# Copy nginx config and start script
+COPY --chown=1000 nginx.conf /etc/nginx/nginx.conf
+COPY --chown=1000 start.sh /app/start.sh
+RUN chmod +x /app/start.sh
+
+# Ensure nginx runs as root
+RUN sed -i 's/^user .*;/user root;/' /etc/nginx/nginx.conf || true
+
+# Set up Xvfb virtual display environment variable
+ENV DISPLAY=:99
+
+# Start Xvfb and then your app
+USER 1000
+
+CMD ["sh", "/app/start.sh"]
+

common-utils

@@ -1 +1 @@
-Subproject commit d8e83ba4748273a696d23d0a11df0dc1ae7fae32
+Subproject commit 6137795c68524d7ee3083df49c6f4d499a6d107b