Update Dockerfile.accelerated_base
This commit is contained in:
@@ -25,8 +25,7 @@ RUN apt-get update && apt-get install -y \
|
|||||||
libswscale-dev \
|
libswscale-dev \
|
||||||
libavdevice-dev \
|
libavdevice-dev \
|
||||||
libavfilter-dev \
|
libavfilter-dev \
|
||||||
# Intel Media SDK dependencies (for QuickSync)
|
# VA-API libraries (common for both architectures)
|
||||||
intel-media-va-driver-non-free \
|
|
||||||
vainfo \
|
vainfo \
|
||||||
libva-dev \
|
libva-dev \
|
||||||
libva-drm2 \
|
libva-drm2 \
|
||||||
@@ -41,6 +40,19 @@ RUN apt-get update && apt-get install -y \
|
|||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install architecture-specific packages
|
||||||
|
RUN ARCH=$(uname -m) && \
|
||||||
|
if [ "$ARCH" = "x86_64" ]; then \
|
||||||
|
# Intel Media SDK dependencies (for QuickSync on x86_64 only)
|
||||||
|
apt-get update && \
|
||||||
|
apt-get install -y intel-media-va-driver-non-free && \
|
||||||
|
apt-get clean && \
|
||||||
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
|
elif [ "$ARCH" = "aarch64" ]; then \
|
||||||
|
# ARM64 may use different video acceleration drivers
|
||||||
|
echo "ARM64 detected: Using default VA-API drivers"; \
|
||||||
|
fi
|
||||||
|
|
||||||
# Install FFmpeg with hardware acceleration support
|
# Install FFmpeg with hardware acceleration support
|
||||||
# Using static build for consistency across architectures
|
# Using static build for consistency across architectures
|
||||||
RUN ARCH=$(uname -m) && \
|
RUN ARCH=$(uname -m) && \
|
||||||
@@ -89,12 +101,20 @@ RUN pip3 install --no-cache-dir \
|
|||||||
# Set working directory
|
# Set working directory
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Set environment variables for hardware acceleration
|
||||||
|
# Note: These are primarily for x86_64 Intel graphics
|
||||||
|
# ARM64 systems may use different drivers
|
||||||
|
ENV LIBVA_DRIVER_NAME=iHD
|
||||||
|
# Set architecture-appropriate driver path (before switching to non-root user)
|
||||||
|
RUN ARCH=$(uname -m) && \
|
||||||
|
if [ "$ARCH" = "x86_64" ]; then \
|
||||||
|
echo "export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri" >> /etc/environment; \
|
||||||
|
elif [ "$ARCH" = "aarch64" ]; then \
|
||||||
|
echo "export LIBVA_DRIVERS_PATH=/usr/lib/aarch64-linux-gnu/dri" >> /etc/environment; \
|
||||||
|
fi
|
||||||
|
|
||||||
# Switch to non-root user by default
|
# Switch to non-root user by default
|
||||||
USER appuser
|
USER appuser
|
||||||
|
|
||||||
# Set environment variables for hardware acceleration
|
|
||||||
ENV LIBVA_DRIVER_NAME=iHD
|
|
||||||
ENV LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
|
|
||||||
|
|
||||||
# Default command
|
# Default command
|
||||||
CMD ["/bin/bash"]
|
CMD ["/bin/bash"]
|
Reference in New Issue
Block a user