From 49f6cc0f0b31bdd453128bf059c181b5e86b9065 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 10 Jul 2019 16:49:15 +0300
Subject: [PATCH] Local pre-commit hooks.
- Use docker_image instead of docker since that's not supported (unless
somthings changes with
https://github.com/pre-commit/pre-commit/issues/1081).
- Fix (or silence) issues found by the pre-commit hooks.
---
.pre-commit-config.yaml | 20 +++++---------------
.pre-commit-hooks.yaml | 6 +++---
Dockerfile | 3 +++
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4d0cfbf..a3e9fbd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,23 +30,13 @@ repos:
name: Hadolint Dockerfile linter
description: Dockerfile linter, validate inline bash, written in Haskell
minimum_pre_commit_version: '0.18.0'
- language: docker
- entry: hadolint
- files: Dockerfile
- - id: docker-compose
- name: docker-compose config
- description: Validate the Docker Compose file using docker-compose config
- minimum_pre_commit_version: '0.18.0'
- language: docker
- entry: docker-compose-config
- files: docker-compose
- types: [ yaml ]
+ language: docker_image
+ entry: adarnimrod/docker-pre-commit hadolint
+ types: [dockerfile]
- id: dockerfile-lint
name: dockerfile-lint
description: A rule based 'linter' for Dockerfiles
minimum_pre_commit_version: '0.18.0'
language: docker_image
- entry: projectatomic/dockerfile-lint dockerfile_lint
- args: [ '-f' ]
- types: [ dockerfile ]
- require_serial: true
+ entry: adarnimrod/docker-pre-commit dockerfile-lint
+ types: [dockerfile]
diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
index 11901f1..2c8ec30 100644
--- a/.pre-commit-hooks.yaml
+++ b/.pre-commit-hooks.yaml
@@ -6,14 +6,14 @@
minimum_pre_commit_version: '0.18.0'
language: docker_image
entry: adarnimrod/docker-pre-commit hadolint
- types: [ dockerfile ]
+ types: [dockerfile]
- id: dockerfile-lint
name: dockerfile-lint
description: A rule based 'linter' for Dockerfiles
minimum_pre_commit_version: '0.18.0'
language: docker_image
entry: adarnimrod/docker-pre-commit dockerfile-lint
- types: [ dockerfile ]
+ types: [dockerfile]
- id: docker-compose
name: docker-compose config
description: Validate the Docker Compose file using docker-compose config
@@ -21,4 +21,4 @@
language: docker_image
entry: adarnimrod/docker-pre-commit docker-compose-config
files: docker-compose
- types: [ yaml ]
+ types: [yaml]
diff --git a/Dockerfile b/Dockerfile
index 184231a..be7b5d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
FROM alpine:3.10
+# hadolint ignore=DL3016,DL3018
RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ \
docker-compose \
npm \
@@ -16,3 +17,5 @@ RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpin
hadolint --version
COPY docker-compose-config dockerfile-lint /usr/local/bin/
USER nobody
+LABEL Name docker-pre-commit
+LABEL Version 0.3.0
--
GitLab