Skip to content

Commit c4b0f29

Browse files
authored
Merge pull request #1995 from shimat/chore/modernize-docker-images
Modernize Docker packaging: drop stale images, fix untested test stages
2 parents 4733587 + 7ec4ed4 commit c4b0f29

11 files changed

Lines changed: 60 additions & 1068 deletions

File tree

.github/workflows/docker-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet10-opencv4.13.0"
12+
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet10-opencv5.0.0"
1313

1414
jobs:
1515
build:

.github/workflows/docker-test-ubuntu.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,38 @@ jobs:
2424

2525
- uses: docker/setup-buildx-action@v4
2626

27+
- name: Test native .so (full)
28+
uses: docker/build-push-action@v7
29+
with:
30+
context: .
31+
file: ${{ env.DOCKER_BUILD_CONTEXT_FULL }}/Dockerfile
32+
target: test-native
33+
build-args: |
34+
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
35+
outputs: type=cacheonly
36+
cache-from: |
37+
type=gha,scope=full-test-native-${{ github.ref_name }}
38+
type=gha,scope=full-test-native-main
39+
type=gha,scope=full-${{ github.ref_name }}
40+
type=gha,scope=full-main
41+
cache-to: type=gha,mode=min,scope=full-test-native-${{ github.ref_name }}
42+
43+
- name: Test .NET class libraries (full)
44+
uses: docker/build-push-action@v7
45+
with:
46+
context: .
47+
file: ${{ env.DOCKER_BUILD_CONTEXT_FULL }}/Dockerfile
48+
target: test-dotnet
49+
build-args: |
50+
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
51+
outputs: type=cacheonly
52+
cache-from: |
53+
type=gha,scope=full-test-dotnet-${{ github.ref_name }}
54+
type=gha,scope=full-test-dotnet-main
55+
type=gha,scope=full-${{ github.ref_name }}
56+
type=gha,scope=full-main
57+
cache-to: type=gha,mode=min,scope=full-test-dotnet-${{ github.ref_name }}
58+
2759
- name: Build with Docker (full)
2860
uses: docker/build-push-action@v7
2961
with:
@@ -47,6 +79,22 @@ jobs:
4779

4880
- uses: docker/setup-buildx-action@v4
4981

82+
- name: Test native .so (slim)
83+
uses: docker/build-push-action@v7
84+
with:
85+
context: .
86+
file: ${{ env.DOCKER_BUILD_CONTEXT_SLIM }}/Dockerfile
87+
target: test-native
88+
build-args: |
89+
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
90+
outputs: type=cacheonly
91+
cache-from: |
92+
type=gha,scope=slim-test-native-${{ github.ref_name }}
93+
type=gha,scope=slim-test-native-main
94+
type=gha,scope=slim-${{ github.ref_name }}
95+
type=gha,scope=slim-main
96+
cache-to: type=gha,mode=min,scope=slim-test-native-${{ github.ref_name }}
97+
5098
- name: Build with Docker (slim)
5199
uses: docker/build-push-action@v7
52100
with:

packaging/docker/al2-dotnet5-opencv4.6.0/Dockerfile

Lines changed: 0 additions & 90 deletions
This file was deleted.

packaging/docker/al2-opencv4.5.1/Dockerfile

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)