From bd2b89d64fa51fb91affe88f515db297fe136977 Mon Sep 17 00:00:00 2001
From: Facu de la Cruz <fmdlc.unix@gmail.com>
Date: Thu, 29 Oct 2020 03:03:52 -0300
Subject: [PATCH] Updating tests

---
 .github/workflows/docker-build.yml            | 21 ++++++++-----------
 .../{yamllint.yaml => lint-score.yaml}        | 17 +++++++--------
 2 files changed, 17 insertions(+), 21 deletions(-)
 rename .github/workflows/{yamllint.yaml => lint-score.yaml} (70%)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index bbe9ebf..d719572 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,37 +1,34 @@
-name: Build
-
+name: Build and Push image
 on:
   push:
     branches:
       - master
       - develop
-    
 defaults:
   run:
     shell: bash
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      
       - name: Install Docker Buildx
         id: buildx
         uses: crazy-max/ghaction-docker-buildx@v1
         with:
           buildx-version: latest
-
+      - name: Hadolint Action
+        uses: brpaz/hadolint-action@v1.1.0
+        with:
+          dockerfile:  ./docker-compose/telegraf/
       - name: hub.docker.com Login
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-        
       - name: Build the multi-arch image
         run: |
           docker buildx build \
-            --push \
-            --tag tty0/isp_telegraf:1.15.3 \
-            --tag tty0/isp_telegraf:latest \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 ./docker-compose/telegraf/
-
+           --push \
+           --tag tty0/isp_telegraf:1.15.3 \
+           --tag tty0/isp_telegraf:latest \
+           --platform linux/amd64,linux/arm/v7,linux/arm64 ./docker-compose/telegraf/
diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/lint-score.yaml
similarity index 70%
rename from .github/workflows/yamllint.yaml
rename to .github/workflows/lint-score.yaml
index 2f54f75..dd7e97d 100644
--- a/.github/workflows/yamllint.yaml
+++ b/.github/workflows/lint-score.yaml
@@ -1,19 +1,19 @@
-name: YAML Lint
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+name: Lint and validate
+on: [ pull_request, push ]
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Hadolint Action
+        uses: brpaz/hadolint-action@v1.1.0
+        with:
+          dockerfile:  ./docker-compose/telegraf/
       - uses: actions/checkout@v2
       - name: YAML Lint
         uses: ibiqlik/action-yamllint@v1.0.0
         with:
-          file_or_dir: ./kubernetes/yaml/ 
-          config_file: ./.yamllint     
+          file_or_dir: ./kubernetes/yaml/
+          config_file: ./.yamllint
       - name: kube-score check
         uses: piraces/kube-score-ga@v0.1.1
         with:
@@ -27,4 +27,3 @@ jobs:
           ignore_missing_schemas: true
           comment: true
           token: ${{ secrets.GH_TOKEN }}
-