From b77f810d767decb7356afcf018afbdf55722ba89 Mon Sep 17 00:00:00 2001
From: Tim Brust <github@timbrust.de>
Date: Sat, 13 Jun 2020 12:57:38 +0000
Subject: [PATCH] ci(actions): use hadolint (#121)

---
 .github/workflows/dockerimage.yml |  2 +-
 .github/workflows/hadolint.yml    | 11 +++++++++++
 .hadolint.yml => .hadolint.yaml   |  0
 .travis.yml                       | 11 -----------
 README.md                         |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/hadolint.yml
 rename .hadolint.yml => .hadolint.yaml (100%)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 59fa700..49f5604 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -1,6 +1,6 @@
 name: Test Docker image
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
new file mode 100644
index 0000000..9ec4c17
--- /dev/null
+++ b/.github/workflows/hadolint.yml
@@ -0,0 +1,11 @@
+name: Lint Dockerfiles
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: brew install hadolint
+      - run: hadolint {10,12}/Dockerfile
diff --git a/.hadolint.yml b/.hadolint.yaml
similarity index 100%
rename from .hadolint.yml
rename to .hadolint.yaml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7239fd5..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: generic
-
-services:
-  - docker
-
-before_install:
-  - docker pull hadolint/hadolint
-
-script:
-  - docker run --rm -i hadolint/hadolint hadolint --ignore DL3018 - < 10/Dockerfile
-  - docker run --rm -i hadolint/hadolint hadolint --ignore DL3018 - < 12/Dockerfile
diff --git a/README.md b/README.md
index 89d82b0..2239250 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![Docker Automated build](https://img.shields.io/docker/automated/timbru31/node-alpine-git.svg)](https://hub.docker.com/r/timbru31/node-alpine-git/)
 [![buildx Status](https://github.com/timbru31/docker-node-alpine-git/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3Abuildx)
-[![Build Status](https://travis-ci.org/timbru31/docker-node-alpine-git.svg?branch=master)](https://travis-ci.org/timbru31/docker-node-alpine-git)
+[![Lint Dockerfiles](https://github.com/timbru31/docker-node-alpine-git/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-node-alpine-git/actions?query=workflow%3A%22Lint+Dockerfiles%22)
+
 
 A minimal Dockerfile based on Node.js 10 LTS (Dubnium) or Node.js 12 LTS (Erbium) alpine with Git and ssh installed.