From 1263958ccd45642baa33651ee756adc032034ab6 Mon Sep 17 00:00:00 2001
From: Robert Volkmann <robert.volkmann@x-cellent.com>
Date: Fri, 6 Sep 2024 10:42:00 +0200
Subject: [PATCH] DROP: Allow building container image on merge conflicts

---
 .github/workflows/docker.yaml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 267d9e4..30e4759 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -1,15 +1,7 @@
 ---
 name: Docker Build Action
 on:
-  pull_request:
-    branches:
-      - master
-  release:
-    types:
-      - published
   push:
-    branches:
-      - master
 
 env:
   REGISTRY: ghcr.io
@@ -44,15 +36,9 @@ jobs:
       with:
         args: --build-tags integration -p bugs -p unused --timeout=5m
 
-    - name: Make tag
-      run: |
-        [ "${GITHUB_EVENT_NAME}" == 'pull_request' ] && echo "tag=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV || true
-        [ "${GITHUB_EVENT_NAME}" == 'release' ] && echo "tag=${GITHUB_REF##*/}" >> $GITHUB_ENV || true
-        [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
-
     - name: Build and push image
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
-        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
+        tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cilium-loadbalancer