Skip to content

Commit d8834b6

Browse files
committed
mod docker actions
1 parent 3d236a1 commit d8834b6

File tree

3 files changed

+27
-34
lines changed

3 files changed

+27
-34
lines changed
Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Ubuntu Docker Image
1+
name: Publish Docker Images
22

33
on:
44
workflow_dispatch:
@@ -9,13 +9,12 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
DOCKER_IMAGE_NAME1: "ubuntu22-dotnet6-opencv4.7.0"
13-
DOCKER_IMAGE_NAME2: "ubuntu22-dotnet6sdk-opencv4.7.0"
12+
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet8-opencv4.12.0"
1413

1514
jobs:
1615
build:
1716
runs-on: ubuntu-latest
18-
17+
1918
steps:
2019
- name: validate input
2120
run: |
@@ -24,25 +23,19 @@ jobs:
2423
exit 1
2524
fi
2625
27-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2827
with:
2928
fetch-depth: 1
30-
31-
- name: docker build 1
29+
30+
- name: docker build
3231
run: |
3332
cd docker/${DOCKER_IMAGE_NAME1}
3433
docker build -t ghcr.io/shimat/opencvsharp/${DOCKER_IMAGE_NAME1}:${{ github.event.inputs.docker_image_tag }} .
3534
36-
- name: docker build 2
37-
run: |
38-
cd docker/${DOCKER_IMAGE_NAME2}
39-
docker build -t ghcr.io/shimat/opencvsharp/${DOCKER_IMAGE_NAME2}:${{ github.event.inputs.docker_image_tag }} .
40-
4135
- name: docker login
4236
run: |
4337
echo ${{secrets.GH_PACKAGES_PAT}} | docker login ghcr.io -u shimat --password-stdin
4438
4539
- name: docker push
4640
run: |
4741
docker push ghcr.io/shimat/opencvsharp/${DOCKER_IMAGE_NAME1}:${{ github.event.inputs.docker_image_tag }}
48-
docker push ghcr.io/shimat/opencvsharp/${DOCKER_IMAGE_NAME2}:${{ github.event.inputs.docker_image_tag }}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Docker Test
2+
3+
on:
4+
pull_request:
5+
types: [synchronize, opened]
6+
7+
env:
8+
DEBIAN_FRONTEND: noninteractive
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 60
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: docker build
19+
run: |
20+
cd docker/ubuntu24-dotnet8-opencv4.12.0
21+
docker build -t shimat/ubuntu24-dotnet8-opencv4.12.0 .

.github/workflows/docker-ubuntu20.yml

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

0 commit comments

Comments
 (0)