Update for 2026.2.1#341
Merged
Merged
Conversation
culhatsker
commented
Jun 23, 2026
culhatsker
commented
Collaborator
- update copyright
- remove ubuntu18 support
- removed pre-generated dockerfiles
- removed windows* support
culhatsker
force-pushed
the
r2621
branch
2 times, most recently
from
June 26, 2026 13:20
b2f4dc2 to
68c871d
Compare
There was a problem hiding this comment.
Pull request overview
This PR updates the Docker CI framework for the 2026.2.1 release by refreshing copyright headers, dropping Ubuntu 18.04 and Windows image support, removing pre-generated Dockerfiles from the repo, and adjusting Dockerfile templates to source licensing files from templates/ instead of dockerfiles/.
Changes:
- Removed Ubuntu 18.04 and Windows (winserver2019/windows20h2) support from the CLI OS list and deleted their template trees.
- Removed the committed, pre-generated
dockerfiles/**artifacts and related Windows workflow. - Updated Dockerfile templates to
COPY templates/{{os}}/third-party-programs-*.txtand added/moved third-party licensing files undertemplates/.
Reviewed changes
Copilot reviewed 79 out of 102 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| utils/utilities.py | Update copyright year range. |
| utils/tests/test_arg_parser.py | Update copyright; adjust expected error text to ubuntu20 wording. |
| utils/tester.py | Update copyright year range. |
| utils/render.py | Update copyright year range. |
| utils/logger.py | Update copyright year range. |
| utils/loader.py | Update copyright year range (no functional changes). |
| utils/exceptions.py | Update copyright year range. |
| utils/docker_api.py | Update copyright year range. |
| utils/builder.py | Update copyright year range. |
| utils/arg_parser.py | Remove ubuntu18/windows OS choices; update error text and device defaults for removed OS. |
| templates/winserver2019/source/url.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/source/local.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/redist/vs.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/python/python38.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/python/python37.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/python/pre_python38.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/msbuild/msbuild2019.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/msbuild/msbuild2019_online.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/install/install.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/install/copy.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/hw/cpu.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/dist/runtime.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/dist/dev.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/common/base.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/cmake/cmake34.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/winserver2019/cmake/cmake314.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/source/url.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/source/local.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/redist/vs.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/python/python38.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/python/python37.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/python/pre_python38.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/msbuild/msbuild2019.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/msbuild/msbuild2019_online.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/install/install.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/install/copy.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/hw/cpu.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/dist/runtime.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/dist/dev.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/common/base.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/cmake/cmake34.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/windows20h2/cmake/cmake314.dockerfile.j2 | Removed (Windows template cleanup). |
| templates/ubuntu24/third-party-programs-docker-runtime.txt | Added/updated runtime third-party notices for ubuntu24 images. |
| templates/ubuntu24/dist/runtime.dockerfile.j2 | Copy licensing file from templates/ instead of dockerfiles/. |
| templates/ubuntu24/dist/dev.dockerfile.j2 | Copy licensing files from templates/ instead of dockerfiles/. |
| templates/ubuntu24/common/base.dockerfile.j2 | Update copyright year range. |
| templates/ubuntu22/dist/runtime.dockerfile.j2 | Copy licensing file from templates/ instead of dockerfiles/. |
| templates/ubuntu22/dist/dev.dockerfile.j2 | Copy licensing files from templates/ instead of dockerfiles/. |
| templates/ubuntu22/common/base.dockerfile.j2 | Update copyright year range. |
| templates/ubuntu20/dist/runtime.dockerfile.j2 | Copy licensing file from templates/ instead of dockerfiles/. |
| templates/ubuntu20/dist/dev.dockerfile.j2 | Copy licensing files from templates/ instead of dockerfiles/. |
| templates/ubuntu20/common/base.dockerfile.j2 | Update copyright year range. |
| templates/ubuntu18/source/url.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/source/local.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/python/python38.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/layers/wheel.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/layers/benchmark.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/install/install.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/install/copy.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/hw/vpu.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/hw/pre_vpu.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/hw/hddl.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/hw/gpu.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/hw/cpu.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/env/runtime_env.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/env/proprietary_env.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/env/dev_no_samples_env.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/env/dev_env.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/dist/runtime.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/dist/dev.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/dist/dev_no_samples.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/ubuntu18/common/base.dockerfile.j2 | Removed (Ubuntu 18.04 template cleanup). |
| templates/rhel8/dist/runtime.dockerfile.j2 | Use local templates/ licensing file instead of downloading via curl. |
| templates/rhel8/dist/dev.dockerfile.j2 | Use local templates/ licensing files instead of downloading via curl. |
| templates/rhel8/common/base.dockerfile.j2 | Update copyright year range. |
| dockerfiles/ubuntu24/openvino_cgn_runtime_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu24/openvino_cgn_dev_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu22/openvino_cgn_runtime_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu22/openvino_cgn_dev_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu20/openvino_cg_runtime_2025.2.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu20/openvino_cg_dev_2025.2.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/ubuntu20/build_custom/README.md | Removed (dockerfiles tree cleanup). |
| dockerfiles/ubuntu20/build_custom/openvino_cmake.txt | Removed (dockerfiles tree cleanup). |
| dockerfiles/ubuntu20/build_custom/opencv_cmake.txt | Removed (dockerfiles tree cleanup). |
| dockerfiles/ubuntu20/build_custom/Dockerfile | Removed (dockerfiles tree cleanup). |
| dockerfiles/rhel8/openvino_cg_runtime_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/rhel8/openvino_cg_dev_2025.3.0.0.dockerfile | Removed (pre-generated Dockerfile cleanup). |
| dockerfiles/rhel8/openshift/README.md | Removed (dockerfiles tree cleanup). |
| dockerfiles/rhel8/autobuild/README.md | Removed (dockerfiles tree cleanup). |
| dockerfiles/README.md | Removed (dockerfiles tree cleanup). |
| docker_openvino.py | Update copyright year range. |
| .github/workflows/update_dockerfiles.yml | Remove Windows OS variants from generation matrix. |
| .github/workflows/manual_publish.yml | Remove Windows publishing paths; update input descriptions/matrix. |
| .github/workflows/images_build_check.yml | Remove Windows build matrix entries and Windows build step. |
| .github/workflows/build_test_win.yml | Removed (Windows CI workflow cleanup). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
453
to
456
| parser.error( | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18'" | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu20'" | ||
| " by default." | ||
| ) |
| @@ -1,5 +1,5 @@ | |||
| # -*- coding: utf-8 -*- | |||
| # Copyright (C) 2019-2024 Intel Corporation | |||
| # Copyright (C) 2019-2026 Intel Corporation | |||
Comment on lines
18
to
21
| host_os: | ||
| description: 'OS for Host machine: ubuntu-20.04, windows-docker' | ||
| description: 'OS for Host machine: ubuntu-20.04' | ||
| required: true | ||
| default: '' |
Comment on lines
35
to
38
| strategy: | ||
| matrix: | ||
| os: [ ubuntu-24.04, windows-docker ] | ||
| os: [ ubuntu-24.04 ] | ||
| runs-on: ${{ matrix.os }} |
| 'tags': ['test:latest'], | ||
| }, | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18' by default.", | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu20' by default.", |
| 'test_expression': 'cpu', | ||
| }, | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18' by default.", | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu20' by default.", |
artanokhov
requested changes
Jun 26, 2026
Collaborator
|
@culhatsker please also switch default images to ubuntu22 as default. |
Comment on lines
451
to
455
| if args.mode == "test" and not (args.tags and args.distribution): | ||
| parser.error( | ||
| "Options --tags and --distribution are mandatory. Image operation system is 'ubuntu18'" | ||
| "Options --tags and --distribution are mandatory. Image operating system is 'ubuntu22'" | ||
| " by default." | ||
| ) |
Comment on lines
+22
to
+24
| export IMAGE=openvino/ubuntu24_dev:2026.2.0 | ||
| docker run -it --device /dev/dri --group-add=$(stat -c %g /dev/dri/render* ) $IMAGE python samples/python/hello_query_device/hello_query_device.py | ||
| ``` |
artanokhov
approved these changes
Jul 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.