alpine build

JonathanTreffler · Jun 17, 2024 · 96a2741 · 96a2741
1 parent 1c542d2
commit 96a2741
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -24,11 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< HEAD
         dockerfile: [ubuntu22, ubuntu20, ubuntu18, alpine]
-=======
-        dockerfile: [ubuntu22, ubuntu20, ubuntu18]
->>>>>>> main
         include:
           - dockerfile: ubuntu22
             tags: |
@@ -40,11 +36,8 @@ jobs:
             tags: ubuntu20
           - dockerfile: ubuntu18
             tags: ubuntu18
-<<<<<<< HEAD
           - dockerfile: alpine
             tags: alpine
-=======
->>>>>>> main
 
     steps:
       - name: Checkout repository