From 7d1a8d49f4e203270c295d5a776e0ba686c5588e Mon Sep 17 00:00:00 2001
From: Mateus Dutra Dadalto <mateusdadalto@gmail.com>
Date: Thu, 4 Aug 2022 18:22:55 -0300
Subject: [PATCH] build: add kind to nginx build matrix

---
 .github/workflows/docker-images.yml | 30 +++++++++--------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index e543f48..7700177 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -41,19 +41,15 @@ jobs:
     strategy:
       matrix:
         nginx: [1.18, 1.19]
+        kind: [alpine, alpine-develop]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Build the graycore/magento-nginx:${{ matrix.nginx }}-alpine image
-        run: docker build ./nginx/${{ matrix.nginx }}/alpine
-          -t graycore/magento-nginx:${{ matrix.nginx }}-alpine-${GITHUB_REF##*/}
-          -t graycore/magento-nginx:${{ matrix.nginx }}-alpine
+      - name: Build the graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }} image
+        run: docker build ./nginx/${{ matrix.nginx }}/${{ matrix.kind }}
+          -t graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }}-${GITHUB_REF##*/}
+          -t graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }}
 
-      - name: Build the graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop image
-        run: docker build ./nginx/${{ matrix.nginx }}/alpine-develop
-          -t graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop-${GITHUB_REF##*/}
-          -t graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop
-      
       - name: Login to registry
         if: ${{ github.event_name == 'release' }}
         run: docker login -u $DOCKER_USER -p $DOCKER_PASS
@@ -61,18 +57,10 @@ jobs:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
       
-      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-alpine image
-        if: ${{ github.event_name == 'release' }}
-        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-alpine
-
-      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-alpine-${GITHUB_REF##*/} image
+      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }} image
         if: ${{ github.event_name == 'release' }}
-        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-alpine-${GITHUB_REF##*/}
+        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }}
 
-      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop image
-        if: ${{ github.event_name == 'release' }}
-        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop
-      
-      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop-${GITHUB_REF##*/} image
+      - name: Publish graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }}-${GITHUB_REF##*/} image
         if: ${{ github.event_name == 'release' }}
-        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-alpine-develop-${GITHUB_REF##*/}
+        run: docker push graycore/magento-nginx:${{ matrix.nginx }}-${{ matrix.kind }}-${GITHUB_REF##*/}