bump: update Ubuntu & drop python 2.x

Author: Borda

.github/workflows/docker-builds.yml

@@ -17,37 +17,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: ["20.04"]
-        python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
+        ubuntu_version: ["22.04"]
+        python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         opencv_version: ["4.10.0"]
         device: ["cpu", "gpu"]
-        cuda_version: ["11.8.0"]
+        cuda_version: ["12.4.1"]
         include:
-          - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
-          - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
-          # fixme: python 3.12 install fails due to wring public keys to deadsnakes
-          # - { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
-          - {
-              ubuntu_version: "22.04",
-              python_version: "3.10",
-              opencv_version: "4.10.0",
-              device: "gpu",
-              cuda_version: "12.5.0",
-            }
-          - {
-              ubuntu_version: "22.04",
-              python_version: "3.11",
-              opencv_version: "4.10.0",
-              device: "gpu",
-              cuda_version: "12.5.0",
-            }
-          - {
-              ubuntu_version: "22.04",
-              python_version: "3.12",
-              opencv_version: "4.10.0",
-              device: "gpu",
-              cuda_version: "12.5.0",
-            }
+          - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
+          - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
+          - { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
+          - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.10.0", device: "cpu" }
+          - { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
+          - { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
+          - { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
+          - { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.8.0" }
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -41,4 +41,4 @@ repos:
       - id: prettier
         files: \.(json|yml|yaml|toml)
         # https://prettier.io/docs/en/options.html#print-width
-        args: ["--print-width=120"]
+        args: ["--print-width=140"]

README.md

@@ -1,11 +1,11 @@
 # Docker: Python-OpenCV-FFmpeg(-CUDA)
 
-Repository for clean Dockerfile containing [FFmpeg](https://www.ffmpeg.org/), [OpenCV4](https://opencv.org/) and [Python2/3](https://www.python.org/), based on [Ubuntu](https://www.ubuntu.com/) 22.04 LTS.
+Repository for clean Dockerfile containing [FFmpeg](https://www.ffmpeg.org/), [OpenCV4](https://opencv.org/) and [Python3](https://www.python.org/), based on [Ubuntu](https://www.ubuntu.com/) 24.04 LTS.
 
 ## Tags
 
-- `:cpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg
-- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.10.x, FFmpeg with CUDA 11.4 support
+- `:cpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.10.x, FFmpeg
+- `:gpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.10.x, FFmpeg with CUDA 12.x support
 
 ## Build
 

cpu/Dockerfile

@@ -21,7 +21,7 @@ RUN \
     # add sources for older pythons
     apt-get update -q --fix-missing && \
     apt-get install -y --no-install-recommends software-properties-common && \
-    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \
@@ -41,12 +41,8 @@ RUN \
 
     # install python dependencies
     # sysctl -w net.ipv4.ip_forward=1 ; \
-    if [[ "$PYTHON_VERSION" == "2.7" || "$PYTHON_VERSION" == "3.6" || "$PYTHON_VERSION" == "3.7" ]]; then \
-        PIP_URL="https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py" ; \
-    else \
-        apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \
-        PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \
-    fi && \
+    apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils && \
+    PIP_URL="https://bootstrap.pypa.io/get-pip.py" && \
     curl $PIP_URL | python
 
 ENV PYTHONPATH="/usr/lib/python${PYTHON_VERSION}/site-packages:/usr/local/lib/python${PYTHON_VERSION}/site-packages"

gpu/Dockerfile

@@ -27,7 +27,7 @@ RUN \
     # add sources for older pythons
     apt-get update -qq --fix-missing && \
     apt-get install -y --no-install-recommends software-properties-common && \
-    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \
@@ -47,11 +47,8 @@ RUN \
 
     # install python dependencies
     # sysctl -w net.ipv4.ip_forward=1 ; \
-    if [[ "$PYTHON_VERSION" == "2.7" || "$PYTHON_VERSION" == "3.6" || "$PYTHON_VERSION" == "3.7" ]]; then \
-        PIP_URL="https://bootstrap.pypa.io/pip/$PYTHON_VERSION/get-pip.py" ; \
-    else \
-        apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils ; \
-        PIP_URL="https://bootstrap.pypa.io/get-pip.py" ; \
+    apt-get -y install --no-install-recommends python${PYTHON_VERSION}-distutils && \
+    PIP_URL="https://bootstrap.pypa.io/get-pip.py" && \
     fi && \
     curl $PIP_URL | python