ppa:deadsnakes/ppa

Borda · Jul 8, 2024 · 973032f · 973032f
1 parent 004dec9
commit 973032f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -21,13 +21,14 @@ jobs:
         python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
         opencv_version: ["4.10.0"]
         device: ["cpu", "gpu"]
+        cuda_version: ["11.8.0"]
         include:
           - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
-          - { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu" }
+          - { 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: "cpu" }
-          - { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu" }
-          - { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
-          - { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu" }
+          - { 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: "cpu" }
+          - { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.5.0" }
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -47,6 +48,7 @@ jobs:
             UBUNTU_VERSION=${{ matrix.ubuntu_version }}
             PYTHON_VERSION=${{ matrix.python_version }}
             OPENCV_VERSION=${{ matrix.opencv_version }}
+            CUDA_VERSION=${{ matrix.cuda_version }}
           file: ${{ matrix.device }}/Dockerfile
           # publish master
           push: ${{ github.ref == 'refs/heads/master' }}

diff --git a/cpu/Dockerfile b/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)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \

diff --git a/gpu/Dockerfile b/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)$ ]]; then \
+    if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
         add-apt-repository ppa:deadsnakes/ppa ; \
     fi && \
     apt-add-repository universe && \