Skip to content

Commit 6dc35d3

Browse files
authored
Update main.yml
1 parent 5a8e143 commit 6dc35d3

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

.github/workflows/main.yml

+1-28
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ name: Docker Image CI
33
on:
44
push:
55
branches: [ "master", "develop" ]
6+
67
pull_request:
78
branches: [ "master", "develop" ]
8-
workflow_dispatch:
9-
# Enable manual run
10-
119

1210
env:
1311
REGISTRY: ghcr.io
@@ -49,7 +47,6 @@ jobs:
4947
5048
- name: Build AppBroker and push Docker image
5149
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
52-
if: github.ref == 'refs/heads/master'
5350
with:
5451
context: .
5552
platforms: linux/amd64,linux/arm/v7
@@ -58,20 +55,8 @@ jobs:
5855
tags: ghcr.io/susch19/appbroker:latest
5956
labels: ${{ steps.meta.outputs.labels }}
6057

61-
- name: Build AppBroker and push Docker image feature branch
62-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
63-
if: github.ref != 'refs/heads/master'
64-
with:
65-
context: .
66-
platforms: linux/amd64,linux/arm/v7
67-
file: AppBrokerASP/Dockerfile
68-
push: ${{ github.event_name != 'pull_request' }}
69-
tags: ghcr.io/susch19/appbroker:${{ env.GITHUB_REF_NAME }}
70-
labels: ${{ steps.meta.outputs.labels }}
71-
7258
- name: Build TCPProxy and push Docker image
7359
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
74-
if: github.ref == 'refs/heads/master'
7560
with:
7661
context: .
7762
platforms: linux/amd64,linux/arm/v7
@@ -80,15 +65,3 @@ jobs:
8065
tags: ghcr.io/susch19/appbroker-tcpproxy:latest
8166
labels: ${{ steps.meta.outputs.labels }}
8267

83-
84-
- name: Build TCPProxy and push Docker image feature branch
85-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
86-
if: github.ref != 'refs/heads/master'
87-
with:
88-
context: .
89-
platforms: linux/amd64,linux/arm/v7
90-
file: TcpProxy/Dockerfile
91-
push: ${{ github.event_name != 'pull_request' }}
92-
tags: ghcr.io/susch19/appbroker-tcpproxy:${{ env.GITHUB_REF_NAME }}
93-
labels: ${{ steps.meta.outputs.labels }}
94-

0 commit comments

Comments
 (0)