Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Valian/docker-python-opencv-ffmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Borda/docker_python-opencv-ffmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Aug 19, 2018

  1. source update

     * update source to ubuntu 16.04 LTS
     * refactoring build py2/3
     * upgrade OpenCV 3.4.2
     * fix fail for python3
     * fix build for CUDA
     * upgrade CUDA 9.2
     * update README
    Jirka authored and Borda committed Aug 19, 2018
    Copy the full SHA
    b24dc0e View commit details
  2. add Travis CI (build)

    Borda committed Aug 19, 2018
    Copy the full SHA
    bd4276c View commit details

Commits on Aug 20, 2018

  1. fix CUDA build

     * add TBB multi-threading
     * add QT support
     * add video I/O
    Borda committed Aug 20, 2018
    Copy the full SHA
    efcb17d View commit details

Commits on Aug 21, 2018

  1. add CircleCI

    Borda committed Aug 21, 2018
    Copy the full SHA
    436312b View commit details

Commits on Sep 20, 2018

  1. Copy the full SHA
    50323c6 View commit details

Commits on Oct 2, 2018

  1. upgrade Ubuntu 18.04

    Borda committed Oct 2, 2018
    Copy the full SHA
    555f16a View commit details

Commits on Feb 17, 2019

  1. upgrade OpenCV4

    * upgrade OpenCV-4.0.1
    * fix loading pip & cv2
    Borda committed Feb 17, 2019
    Copy the full SHA
    ba3324d View commit details

Commits on Feb 28, 2019

  1. simplify Dockerfiles #2

    * pass pyVersion as arg
    * extend py3.7
    * test cv2.version
    * update CI
    Borda committed Feb 28, 2019
    Copy the full SHA
    30dda31 View commit details

Commits on Apr 11, 2019

  1. upgrade openCV 4.1.0

    Borda committed Apr 11, 2019
    Copy the full SHA
    3a49ee6 View commit details

Commits on Jun 1, 2019

  1. openCV as argument

    Borda committed Jun 1, 2019
    Copy the full SHA
    d597a74 View commit details

Commits on Aug 20, 2019

  1. update OpenCV 4.1.1 & CUDA 10.1

    * fix build issue
      opencv/opencv#14868
    * apt fix-missing
    Borda committed Aug 20, 2019
    Copy the full SHA
    995c3ca View commit details

Commits on Sep 19, 2019

  1. repaired builds

    * no install recommends
    * rename CUDA file
    Borda committed Sep 19, 2019
    Copy the full SHA
    d44233f View commit details

Commits on Sep 30, 2019

  1. fix CUDA paths

    Borda committed Sep 30, 2019
    Copy the full SHA
    b76dc82 View commit details
  2. build without tests

    Borda committed Sep 30, 2019
    Copy the full SHA
    feaa269 View commit details

Commits on Oct 9, 2019

  1. refactoring

    * divide cpu/gpu images
    Borda committed Oct 9, 2019
    Copy the full SHA
    7bea227 View commit details

Commits on Oct 20, 2019

  1. CI: image build & push

    Borda committed Oct 20, 2019
    Copy the full SHA
    1913cb4 View commit details

Commits on Oct 22, 2019

  1. default OpenCV 4.1.2

    Borda committed Oct 22, 2019
    Copy the full SHA
    2c89b5b View commit details

Commits on Dec 22, 2019

  1. default OpenCV 4.2.0

    Borda committed Dec 22, 2019
    Copy the full SHA
    7a8a5fb View commit details

Commits on Apr 4, 2020

  1. upgrade OpenCV 4.3.0

    Borda committed Apr 4, 2020
    Copy the full SHA
    d1b9b86 View commit details

Commits on Jun 9, 2020

  1. add py3.8

    Borda committed Jun 9, 2020
    Copy the full SHA
    70ab128 View commit details

Commits on Aug 12, 2020

  1. matrix build

    Borda committed Aug 12, 2020
    Copy the full SHA
    b49837a View commit details

Commits on Aug 15, 2020

  1. upgrade Ubuntu 20.04 & OpenCV 4.4 (#5)

    * upgrade openCV 4.4.0
    * ubuntu 20.04
    * badges
    Borda authored Aug 15, 2020
    Copy the full SHA
    8f60de6 View commit details

Commits on Oct 16, 2020

  1. update openCV 4.5 & cuda 11.1

    Borda committed Oct 16, 2020
    Copy the full SHA
    db16dce View commit details
  2. add python 3.9

    Borda committed Oct 16, 2020
    Copy the full SHA
    44c593e View commit details

Commits on Oct 25, 2020

  1. minor update

    * maintain
    Borda committed Oct 25, 2020
    Copy the full SHA
    4c04bf5 View commit details

Commits on Dec 29, 2020

  1. update openCV 4.5.1

    Borda committed Dec 29, 2020
    Copy the full SHA
    829e683 View commit details

Commits on Jan 14, 2021

  1. Set theme jekyll-theme-tactile

    Borda committed Jan 14, 2021
    Copy the full SHA
    0019f3c View commit details
  2. add GH action (#6)

    * add badge
    Borda authored Jan 14, 2021
    Copy the full SHA
    372c5a0 View commit details
  3. fix docker badge

    Borda committed Jan 14, 2021
    Copy the full SHA
    c9e75fc View commit details

Commits on May 7, 2021

  1. openCV 4.5.2 & fix py2.7

    Borda committed May 7, 2021
    Copy the full SHA
    fc30c43 View commit details

Commits on Jul 7, 2021

  1. add stale

    Borda committed Jul 7, 2021
    Copy the full SHA
    9404d70 View commit details
  2. add GH templates

    Borda committed Jul 7, 2021
    Copy the full SHA
    44f3edb View commit details
  3. Copy the full SHA
    d7b465d View commit details

Commits on Jul 8, 2021

  1. default py3.9

    Borda committed Jul 8, 2021
    Copy the full SHA
    084dcc7 View commit details

Commits on Oct 15, 2021

  1. openCV 4.5.4

    Borda committed Oct 15, 2021
    Copy the full SHA
    7ad0871 View commit details
  2. cut layers: python / openCV

    Borda committed Oct 15, 2021
    Copy the full SHA
    3cdbdf8 View commit details

Commits on Jan 3, 2022

  1. cv 4.5.5

    Borda committed Jan 3, 2022
    Copy the full SHA
    e4a802c View commit details

Commits on Jun 8, 2022

  1. update & openCV 4.6.0

    Borda committed Jun 8, 2022
    Copy the full SHA
    ba5ad36 View commit details
  2. ci/cd: GHA

    * drop CircleCI
    * drop Travis
    * check schema
    Borda committed Jun 8, 2022
    Copy the full SHA
    0513743 View commit details
  3. pre-commit

    * define
    * apply
    Borda committed Jun 8, 2022
    Copy the full SHA
    0e1bb0c View commit details

Commits on Sep 23, 2022

  1. add dependabot

    Borda committed Sep 23, 2022
    Copy the full SHA
    a02e33f View commit details

Commits on Oct 18, 2022

  1. Bump actions/setup-python from 2 to 4 (#12)

    Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4.
    - [Release notes](https://github.com/actions/setup-python/releases)
    - [Commits](actions/setup-python@v2...v4)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-python
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    e213b0d View commit details
  2. Bump actions/cache from 2 to 3.0.11 (#18)

    Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.0.11.
    - [Release notes](https://github.com/actions/cache/releases)
    - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
    - [Commits](actions/cache@v2...v3.0.11)
    
    ---
    updated-dependencies:
    - dependency-name: actions/cache
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    bda9e4d View commit details
  3. Bump docker/build-push-action from 2 to 3 (#13)

    Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
    - [Release notes](https://github.com/docker/build-push-action/releases)
    - [Commits](docker/build-push-action@v2...v3)
    
    ---
    updated-dependencies:
    - dependency-name: docker/build-push-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    8870aa8 View commit details
  4. Bump pre-commit/action from 2.0.2 to 3.0.0 (#14)

    Bumps [pre-commit/action](https://github.com/pre-commit/action) from 2.0.2 to 3.0.0.
    - [Release notes](https://github.com/pre-commit/action/releases)
    - [Commits](pre-commit/action@v2.0.2...v3.0.0)
    
    ---
    updated-dependencies:
    - dependency-name: pre-commit/action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    10b17ff View commit details
  5. Bump docker/login-action from 1 to 2 (#15)

    Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
    - [Release notes](https://github.com/docker/login-action/releases)
    - [Commits](docker/login-action@v1...v2)
    
    ---
    updated-dependencies:
    - dependency-name: docker/login-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    ef759a3 View commit details
  6. Bump docker/setup-buildx-action from 1 to 2 (#16)

    Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
    - [Release notes](https://github.com/docker/setup-buildx-action/releases)
    - [Commits](docker/setup-buildx-action@v1...v2)
    
    ---
    updated-dependencies:
    - dependency-name: docker/setup-buildx-action
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 18, 2022
    Copy the full SHA
    8234e9b View commit details
  7. add codeowner

    Borda committed Oct 18, 2022
    Copy the full SHA
    6184ca7 View commit details

Commits on Oct 19, 2022

  1. CI: login on master (#17)

    Borda authored Oct 19, 2022
    Copy the full SHA
    1d42404 View commit details

Commits on Dec 20, 2022

  1. building images for py3.11 (#20)

    * building py3.11
    * less CI builds
    Borda authored Dec 20, 2022
    Copy the full SHA
    5eecd6a View commit details
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for review when someone opens a pull request.
* @borda
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug, help wanted
assignees: ''
---

## 🐛 Bug

<!-- A clear and concise description of what the bug is. -->

### To Reproduce

Steps to reproduce the behavior:

1. Go to '...'
2. Run '....'
3. See error

<!-- If you have a code sample, error messages, stack traces, please provide it here as well -->

### Expected behavior

<!-- A clear and concise description of what you expected to happen. -->

### Additional context

<!-- Add any other context about the problem here. -->
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement, help wanted
assignees: ''
---

## 🚀 Feature

<!-- A clear and concise description of the feature proposal -->

### Motivation

<!-- Please outline the motivation for the proposal. Is your feature request related to a problem? e.g., I'm always frustrated when [...]. If this is related to another GitHub issue, please link here too -->

### Alternatives

<!-- A clear and concise description of any alternative solutions or features you've considered, if any. -->

### Additional context

<!-- Add any other context or screenshots about the feature request here. -->
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Before submitting

- [ ] Was this discussed/approved via a Github issue? (no need for typos and docs improvements)
- [ ] Did you make sure to update the docs?
- [ ] Did you write any new necessary tests?

## What does this PR do?

Fixes #(issue).

## PR review

Anyone in the community is free to review the PR once the tests have passed.
If we didn't discuss your PR in Github issues there's a high chance it will not be merged.

## Did you have fun?

Make sure you had fun coding 🙃
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Basic dependabot.yml file with minimum configuration for two package managers
version: 2
updates:
# Enable version updates for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
# Check for updates once a week
schedule:
interval: "monthly"
# Labels on pull requests for version updates only
labels:
- "CI / tests"
pull-request-branch-name:
# Separate sections of the branch name with a hyphen for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
separator: "-"
# Allow up to 5 open pull requests for GitHub Actions
open-pull-requests-limit: 5
reviewers:
- "borda"
19 changes: 19 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# https://github.com/marketplace/stale

# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: won't fix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
19 changes: 19 additions & 0 deletions .github/workflows/ci_schema.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: CI action schema
on:
push: {}
pull_request:
branches: [master]

jobs:
validate-schema:
runs-on: ubuntu-20.04
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install pkg
run: pip install "check-jsonschema>=0.10"

- name: GH Workflows
run: check-jsonschema .github/workflows/*.yml --builtin-schema "github-workflows"
72 changes: 72 additions & 0 deletions .github/workflows/docker-builds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Publish Docker Image
# https://www.docker.com/blog/first-docker-github-action-is-here
# https://github.com/docker/build-push-action
on: # Trigger the workflow on push or pull request, but only for the master branch
push:
branches: [master]
pull_request:
branches: [master]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

jobs:
build-push:
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
ubuntu_version: ["22.04"]
python_version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
opencv_version: ["4.11.0"]
device: ["cpu", "gpu"]
cuda_version: ["12.4.1"]
include:
- { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.11.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.11.0", device: "cpu" }
#- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.11.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.11.0", device: "cpu" }
- { ubuntu_version: "24.04", python_version: "3.10", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" }
- { ubuntu_version: "24.04", python_version: "3.11", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" }
#- { ubuntu_version: "24.04", python_version: "3.12", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" }
- { ubuntu_version: "24.04", python_version: "3.13", opencv_version: "4.11.0", device: "gpu", cuda_version: "12.8.0" }
steps:
- name: Checkout
uses: actions/checkout@v4
# https://github.com/docker/setup-buildx-action
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
- uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
if: github.ref == 'refs/heads/master'
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- uses: docker/build-push-action@v6
# https://github.com/docker/build-push-action#cache-to-registry
with:
build-args: |
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' }}
tags: borda/docker_python-opencv-ffmpeg:${{ matrix.device }}-py${{ matrix.python_version }}-cv${{ matrix.opencv_version }}
timeout-minutes: 240

build-guardian:
runs-on: ubuntu-latest
needs: build-push
if: always()
steps:
- run: echo "${{ needs.build-push.result }}"
- name: failing...
if: needs.build-push.result == 'failure'
run: exit 1
- name: cancelled or skipped...
if: contains(fromJSON('["cancelled", "skipped"]'), needs.build-push.result)
timeout-minutes: 1
run: sleep 90
22 changes: 22 additions & 0 deletions .github/workflows/label-conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Label conflicts

on:
push:
branches: ["master"]
pull_request_target:
types: ["synchronize", "reopened", "opened"]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
triage-conflicts:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Jul 20, 2023
with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 3
WAIT_MS: 5000
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# PyCharm
.idea/
48 changes: 48 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
default_language_version:
python: python3

ci:
autofix_prs: true
autoupdate_commit_msg: "[pre-commit.ci] pre-commit suggestions"
autoupdate_schedule: quarterly
# submodules: true

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- id: check-json
- id: check-yaml
- id: check-executables-have-shebangs
- id: check-case-conflict
- id: check-added-large-files
- id: detect-private-key

- repo: https://github.com/codespell-project/codespell
rev: v2.2.5
hooks:
- id: codespell

- repo: https://github.com/executablebooks/mdformat
rev: 0.7.17
hooks:
- id: mdformat
args: ["--number"]
additional_dependencies:
- mdformat-gfm
- mdformat_frontmatter

- repo: https://github.com/pryorda/dockerfilelint-precommit-hooks
rev: v0.1.0
hooks:
- id: dockerfilelint

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
hooks:
- id: prettier
files: \.(json|yml|yaml|toml)
# https://prettier.io/docs/en/options.html#print-width
args: ["--print-width=140"]
40 changes: 0 additions & 40 deletions Dockerfile-py2

This file was deleted.

40 changes: 0 additions & 40 deletions Dockerfile-py2-cuda

This file was deleted.

Loading