From 487feeddae49ad165699cc20ef736792312eb2ef Mon Sep 17 00:00:00 2001 From: Brian Jubelirer Date: Wed, 14 Dec 2022 11:14:11 -0500 Subject: [PATCH 1/4] remove unneeded files, python3 only --- .github/CODEOWNERS | 6 ----- .github/ISSUE_TEMPLATE/bug_report.md | 29 ----------------------- .github/ISSUE_TEMPLATE/feature_request.md | 23 ------------------ .github/PULL_REQUEST_TEMPLATE.md | 18 -------------- .github/workflows/docker-builds.yml | 2 +- README.md | 17 ++++++------- _config.yml | 1 - 7 files changed, 8 insertions(+), 88 deletions(-) delete mode 100644 .github/CODEOWNERS delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 _config.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index a8687a1..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# 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 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 15cdcc8..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: bug, help wanted -assignees: '' ---- - -## 🐛 Bug - - - -### To Reproduce - -Steps to reproduce the behavior: - -1. Go to '...' -1. Run '....' -1. See error - - - -### Expected behavior - - - -### Additional context - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 36269e3..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: enhancement, help wanted -assignees: '' ---- - -## 🚀 Feature - - - -### Motivation - - - -### Alternatives - - - -### Additional context - - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 7642926..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ -# 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 🙃 diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 5236da9..f9625e1 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - python_version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10"] + python_version: ["3.7", "3.8", "3.9", "3.10"] opencv_version: ["4.6.0"] device: ["cpu", "gpu"] steps: diff --git a/README.md b/README.md index a4caf1e..5c81ee8 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,19 @@ # 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/) 20.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/) 20.04 LTS. ## Tags -- `:cpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.6.x, FFmpeg -- `:gpu-pyX.y-cvX.y.z` for Python 2.x/3.x, OpenCV 4.6.x, FFmpeg with CUDA 11.4 support +- `:cpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.6.x, FFmpeg +- `:gpu-pyX.y-cvX.y.z` for Python 3.x, OpenCV 4.6.x, FFmpeg with CUDA 11.4 support ## Build -[![Publish Docker Image](https://github.com/Borda/docker_python-opencv-ffmpeg/workflows/Publish%20Docker%20Image/badge.svg?branch=master&event=push)](https://github.com/Borda/docker_python-opencv-ffmpeg/actions?query=workflow%3A%22Publish+Docker+Image%22) -[![Docker Build Status](https://img.shields.io/docker/cloud/build/borda/docker_python-opencv-ffmpeg)](https://hub.docker.com/r/borda/docker_python-opencv-ffmpeg) -[![DockerHub Pulls](https://img.shields.io/docker/pulls/borda/docker_python-opencv-ffmpeg.svg)](https://hub.docker.com/r/borda/docker_python-opencv-ffmpeg) -[![Docker](https://img.shields.io/docker/automated/borda/docker_python-opencv-ffmpeg)](https://hub.docker.com/r/borda/docker_python-opencv-ffmpeg) +[![Publish Docker Image](https://github.com/dzynetech/docker_python-opencv-ffmpeg/workflows/Publish%20Docker%20Image/badge.svg?branch=master&event=push)](https://github.com/dzynetech/docker_python-opencv-ffmpeg/actions?query=workflow%3A%22Publish+Docker+Image%22) +[![Docker Build Status](https://img.shields.io/docker/cloud/build/bjubes/docker_python-opencv-ffmpeg)](https://hub.docker.com/r/bjubes/docker_python-opencv-ffmpeg) +[![DockerHub Pulls](https://img.shields.io/docker/pulls/bjubes/docker_python-opencv-ffmpeg.svg)](https://hub.docker.com/r/bjubes/docker_python-opencv-ffmpeg) +[![Docker](https://img.shields.io/docker/automated/bjubes/docker_python-opencv-ffmpeg)](https://hub.docker.com/r/bjubes/docker_python-opencv-ffmpeg) - First you need to install docker on your local computer, see following [tutorial](https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository). Note, for running the docker properly you have be logged as superuser otherwise you will face many partial issues which sometimes does not make much sense. diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 72d781d..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-tactile From 01b8eb64e43f1228f49d0592d332c331a2bf787f Mon Sep 17 00:00:00 2001 From: Brian Jubelirer Date: Wed, 14 Dec 2022 11:25:23 -0500 Subject: [PATCH 2/4] fix md format --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5c81ee8..454ae39 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ Repository for clean Dockerfile containing [FFmpeg](https://www.ffmpeg.org/), [O [![DockerHub Pulls](https://img.shields.io/docker/pulls/bjubes/docker_python-opencv-ffmpeg.svg)](https://hub.docker.com/r/bjubes/docker_python-opencv-ffmpeg) [![Docker](https://img.shields.io/docker/automated/bjubes/docker_python-opencv-ffmpeg)](https://hub.docker.com/r/bjubes/docker_python-opencv-ffmpeg) - First you need to install docker on your local computer, see following [tutorial](https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository). Note, for running the docker properly you have be logged as superuser otherwise you will face many partial issues which sometimes does not make much sense. You can build it on your own, note it takes lots of time, be prepared. From 810ca2fa27ab9ffbcc734ecd54c789065769c69a Mon Sep 17 00:00:00 2001 From: Brian Jubelirer Date: Wed, 14 Dec 2022 14:44:39 -0500 Subject: [PATCH 3/4] only build on commits/prs to master --- .github/workflows/docker-builds.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index f9625e1..2a7e3fa 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -2,9 +2,12 @@ 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: {} + push: + branches: + - master pull_request: - branches: [ master ] + branches: + - master concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }} From 22948db8f9534840f6aa2819e68556ddcf972571 Mon Sep 17 00:00:00 2001 From: Brian Jubelirer Date: Wed, 14 Dec 2022 15:03:04 -0500 Subject: [PATCH 4/4] fixup --- .github/workflows/docker-builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 2a7e3fa..47c0428 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -1,8 +1,8 @@ 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: +on: # Trigger the workflow on push or pull request, but only for the master branch + push: branches: - master pull_request: