From 42b18205ccf5adbf71c666135492847c7d696e96 Mon Sep 17 00:00:00 2001
From: Davod <davidkingnt@gmail.com>
Date: Sun, 1 Oct 2023 23:25:46 -0300
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 63 ++++++++++--------------------
 1 file changed, 20 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f2558ca..b5ec014 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,29 +6,17 @@ on:
   pull_request:
     branches: [ "main" ]
   workflow_dispatch:
-    inputs:
-      logLevel:
-        description: 'Log level'
-        required: true
-        default: 'warning'
-        type: choice
-        options:
-        - info
-        - warning
-        - debug
-      tags:
-        description: 'Test scenario tags'
-        required: false
-        type: boolean
-      environment:
-        description: 'Environment to run tests against'
-        type: environment
-        required: false
+  schedule: 
+   - cron: '0 0 */15 * *'
 
 jobs:
-
   ltsc2022:
+    strategy:
+      matrix:
+        VS_VER: ["2022", "2019", "2017"]
     runs-on: windows-2022
+    env:
+      WIN_VER: ltsc2022
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,21 +25,18 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: vs2022
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2022-workload-vctools --tag amitie10g/visualstudio2022-workload-vctools:ltsc2022 --build-arg WIN_VER=ltsc2022 --build-arg VS_VER=2022 .
-      - name: vs2019
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2019-workload-vctools --tag amitie10g/visualstudio2019-workload-vctools:ltsc2022 --build-arg WIN_VER=ltsc2022 --build-arg VS_VER=2019 .
-      - name: vs2017
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2017-workload-vctools --tag amitie10g/visualstudio2017-workload-vctools:ltsc2022 --build-arg WIN_VER=ltsc2022 --build-arg VS_VER=2017 .
-      - name: Push2022
-        run: docker push amitie10g/visualstudio2022-workload-vctools --all-tags
-      - name: Push2019
-        run: docker push amitie10g/visualstudio2019-workload-vctools --all-tags
-      - name: Push2016
-        run: docker push amitie10g/visualstudio2017-workload-vctools --all-tags
+      - name: build
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/visualstudio${{ matrix.VS_VER }}-workload-vctools -t ${{ secrets.DOCKERHUB_USERNAME }}/visualstudio${{ matrix.VS_VER }}-workload-vctools:${{ env.WIN_VER }} --build-arg WIN_VER=${{ env.WIN_VER }} --build-arg VS_VER=${{ matrix.VS_VER }} .
+      - name: push
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/visualstudio${{ matrix.VS_VER }}-workload-vctools --all-tags
 
   ltsc2019:
+    strategy:
+      matrix:
+        VS_VER: ["2022", "2019", "2017"]
     runs-on: windows-2019
+    env:
+      WIN_VER: ltsc2019
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -60,15 +45,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: vs2022
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2022-workload-vctools:ltsc2019 --build-arg WIN_VER=ltsc2019 --build-arg VS_VER=2022 .
-      - name: vs2019
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2019-workload-vctools:ltsc2019 --build-arg WIN_VER=ltsc2019 --build-arg VS_VER=2019 .
-      - name: vs2017
-        run: docker build --file Dockerfile --tag amitie10g/visualstudio2017-workload-vctools:ltsc2019 --build-arg WIN_VER=ltsc2019 --build-arg VS_VER=2017 .
-      - name: Push2022
-        run: docker push amitie10g/visualstudio2022-workload-vctools --all-tags
-      - name: Push2019
-        run: docker push amitie10g/visualstudio2019-workload-vctools --all-tags
-      - name: Push2016
-        run: docker push amitie10g/visualstudio2017-workload-vctools --all-tags
+      - name: build
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/visualstudio${{ matrix.VS_VER }}-workload-vctools:${{ env.WIN_VER }} --build-arg WIN_VER=${{ env.WIN_VER }} --build-arg VS_VER=${{ matrix.VS_VER }} .
+      - name: push
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/visualstudio${{ matrix.VS_VER }}-workload-vctools --all-tags