Skip to content

Commit 973032f

Browse files
committed
ppa:deadsnakes/ppa
1 parent 004dec9 commit 973032f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/docker-builds.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ jobs:
2121
python_version: ["2.7", "3.6", "3.7", "3.8", "3.9"]
2222
opencv_version: ["4.10.0"]
2323
device: ["cpu", "gpu"]
24+
cuda_version: ["11.8.0"]
2425
include:
2526
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "cpu" }
26-
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu" }
27+
- { ubuntu_version: "22.04", python_version: "3.10", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.5.0" }
2728
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "cpu" }
28-
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu" }
29-
- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
30-
- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu" }
29+
- { ubuntu_version: "22.04", python_version: "3.11", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.5.0"}
30+
- { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "cpu" }
31+
- { ubuntu_version: "22.04", python_version: "3.12", opencv_version: "4.10.0", device: "gpu", cuda_version: "12.5.0" }
3132
steps:
3233
- name: Checkout
3334
uses: actions/checkout@v4
@@ -47,6 +48,7 @@ jobs:
4748
UBUNTU_VERSION=${{ matrix.ubuntu_version }}
4849
PYTHON_VERSION=${{ matrix.python_version }}
4950
OPENCV_VERSION=${{ matrix.opencv_version }}
51+
CUDA_VERSION=${{ matrix.cuda_version }}
5052
file: ${{ matrix.device }}/Dockerfile
5153
# publish master
5254
push: ${{ github.ref == 'refs/heads/master' }}

cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN \
2121
# add sources for older pythons
2222
apt-get update -q --fix-missing && \
2323
apt-get install -y --no-install-recommends software-properties-common && \
24-
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
24+
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
2525
add-apt-repository ppa:deadsnakes/ppa ; \
2626
fi && \
2727
apt-add-repository universe && \

gpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN \
2727
# add sources for older pythons
2828
apt-get update -qq --fix-missing && \
2929
apt-get install -y --no-install-recommends software-properties-common && \
30-
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7)$ ]]; then \
30+
if [[ "$PYTHON_VERSION" =~ ^(2.7|3.6|3.7|3.12)$ ]]; then \
3131
add-apt-repository ppa:deadsnakes/ppa ; \
3232
fi && \
3333
apt-add-repository universe && \

0 commit comments

Comments
 (0)