From 0a1e7b83d6e72a8374a6e4689cb16df929fd9556 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 16 Sep 2021 22:12:17 +0300
Subject: [PATCH] Reenable the Docker pre-commit hooks.
First of all, I'm replacing the hadolint hook that I maintained with the
one from https://github.com/AleksaC/hadolint-py and the docker-compose
hook with the new one I maintain at
https://git.shore.co.il/nimrod/pre-commit-hooks. Both don't require
Docker at all (just regular Python). Also, with
https://github.com/pre-commit/pre-commit/issues/1387 and then
https://github.com/pre-commit/pre-commit/issues/1918 resolved, the
original hooks that required Docker should work anyway.
I'm keeping the gitlab-ci hook disable for now, the 401 issue is still
present and there's little point in validating the CI config while it's
running (it is running after all).
---
templates/pre-commit.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/templates/pre-commit.yml b/templates/pre-commit.yml
index 8a818b4..8bb1f7f 100644
--- a/templates/pre-commit.yml
+++ b/templates/pre-commit.yml
@@ -5,9 +5,8 @@ pre-commit:
tags: [ns4.shore.co.il]
variables:
XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
- # Disabled until https://github.com/pre-commit/pre-commit/issues/1387 is
- # resolved.
- SKIP: "hadolint,docker-compose,gitlab-ci-linter"
+ SKIP: |-
+ gitlab-ci-linter
script:
- pre-commit run --all-files
cache:
--
GitLab