File tree 1 file changed +5
-5
lines changed
1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -3,10 +3,9 @@ name: Docker Image CI
3
3
on :
4
4
push :
5
5
branches : [ master ]
6
- pull_request :
7
- branches : [ master ]
8
6
schedule :
9
7
- cron : 0 6 * * 1
8
+ pull_request :
10
9
workflow_dispatch :
11
10
12
11
jobs :
@@ -37,17 +36,18 @@ jobs:
37
36
tags : |
38
37
type=sha
39
38
- name : Login to GitHub Container Registry
40
- if : github.event_name != ' pull_request'
39
+ if : github.event_name == 'push' || ( github.event_name == ' pull_request' && github.event.action == 'opened' && github.event.pull_request.merged == 'true' )
41
40
uses : docker/login-action@v3
42
41
with :
43
42
registry : ghcr.io
44
43
username : ${{ github.actor }}
45
44
password : ${{ secrets.GITHUB_TOKEN }}
46
45
- name : Build Docker Image and push
47
- uses : docker/build-push-action@v6
46
+ if : github.event_name == 'push' || ( github.event_name == 'pull_request' && github.event.action == 'opened' && github.event.pull_request.merged == 'true' )
47
+ uses : docker/build-push-action@v5
48
48
with :
49
49
file : docker/Dockerfile.development
50
- push : ${{ github.event_name == 'push' }}
50
+ push : true
51
51
tags : ${{ steps.meta.outputs.tags }}
52
52
labels : ${{ steps.meta.outputs.labels }}
53
53
context : .
You can’t perform that action at this time.
0 commit comments