Skip to content

Commit cb99acd

Browse files
authored
Merge pull request #46 from laradock/bestlong-patch-2
Update dockerpublish.yml
2 parents 775136b + 64d3811 commit cb99acd

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/dockerpublish.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ name: Docker Image CI
22

33
on:
44
push:
5-
branches: '**'
5+
branches:
6+
- 'master'
67
tags: '**'
8+
pull_request:
9+
branches:
10+
- 'master'
711
schedule:
812
- cron: 0 0 * * 6
913

@@ -27,7 +31,6 @@ jobs:
2731
suffix=-${{ matrix.php_version }}
2832
tags: |
2933
type=schedule,pattern={{date 'YYYYMMDD'}}
30-
type=ref,event=branch
3134
type=ref,event=tag
3235
type=semver,pattern={{version}}
3336
type=raw,value=latest
@@ -39,7 +42,7 @@ jobs:
3942
uses: docker/setup-buildx-action@v1
4043

4144
- name: Login to Docker Hub
42-
if: ${{ (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
45+
if: ${{ (github.repository == 'laradock/workspace') }}
4346
uses: docker/login-action@v1
4447
with:
4548
username: ${{ secrets.DOCKER_HUB_USER }}
@@ -50,5 +53,5 @@ jobs:
5053
with:
5154
file: Dockerfile-${{ matrix.php_version }}
5255
platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6
53-
push: ${{ (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
56+
push: ${{ (github.repository == 'laradock/workspace') }}
5457
tags: ${{ steps.meta.outputs.tags }}

0 commit comments

Comments
 (0)