From 0fca5c8e9a4b1771c597e3d9799e99c6cd565f71 Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Fri, 18 Mar 2022 23:10:40 +0000 Subject: [PATCH] added cuda drivers to cuda Dockerfile; updated slim Dockerfile for current version --- Dockerfile.cuda | 4 ++-- Dockerfile.slim-alpine | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile.cuda b/Dockerfile.cuda index da151e9..4edd186 100644 --- a/Dockerfile.cuda +++ b/Dockerfile.cuda @@ -1,7 +1,7 @@ # Name: Video2X Dockerfile (CUDA) # Creator: K4YT3X # Date Created: February 3, 2022 -# Last Modified: February 26, 2022 +# Last Modified: March 18, 2022 # stage 1: build the python components into wheels FROM docker.io/nvidia/cuda:11.6.0-runtime-ubuntu20.04 AS builder @@ -30,7 +30,7 @@ WORKDIR /video2x RUN apt-get install -y --no-install-recommends \ python3-pip python3-dev \ python3-opencv python3-pil \ - mesa-vulkan-drivers ffmpeg \ + mesa-vulkan-drivers cuda-drivers ffmpeg \ && pip install --no-cache-dir --no-index -f /wheels . \ && apt-get clean \ && rm -rf /wheels /video2x /var/lib/apt/lists/* diff --git a/Dockerfile.slim-alpine b/Dockerfile.slim-alpine index f20e33f..5de45e4 100644 --- a/Dockerfile.slim-alpine +++ b/Dockerfile.slim-alpine @@ -1,20 +1,18 @@ # Name: Video2X Dockerfile (Slim Alpine) # Creator: K4YT3X # Date Created: February 1, 2022 -# Last Modified: February 4, 2022 +# Last Modified: March 18, 2022 # stage: build python components into heels FROM docker.io/library/python:3.10.2-alpine3.15 AS builder COPY . /video2x WORKDIR /video2x RUN apk add --no-cache \ - cmake g++ gcc git ninja swig \ + cmake g++ gcc git ninja swig linux-headers \ ffmpeg-dev glslang-dev jpeg-dev vulkan-loader-dev zlib-dev \ - linux-headers \ && pip install -U pip \ && CMAKE_ARGS="-DWITH_FFMPEG=YES" pip wheel -w /wheels opencv-python \ - && pip wheel -w /wheels wheel setuptools setuptools_scm \ - rife-ncnn-vulkan-python@git+https://github.com/media2x/rife-ncnn-vulkan-python.git . + && pip wheel -w /wheels wheel pdm-pep517 . # stage 2: install wheels into final image FROM docker.io/library/python:3.10.2-alpine3.15