Commit 47879268 authored by nimrod's avatar nimrod
Browse files

Many updates. 

- README.
- pre-commit.
- GitLab CI.
parent a2a6107b

.gitlab-ci.yml

0 → 100644
+6 −0
Changes for .gitlab-ci.yml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
---

include:

  - project: shore/ci-templates

    file: templates/pre-commit.yml

  - project: shore/ci-templates

    file: templates/pre-commit-repo.yml

.pre-commit-config.yaml

+29 −15
Changes for .pre-commit-config.yaml: 29 added lines, 15 removed lines.
Original line number Diff line number Diff line 
# vim:ff=unix ts=2 sw=2 ai expandtab

---

repos:

  - repo: https://github.com/pre-commit/pre-commit-hooks

    rev: v2.2.3

  - repo: https://github.com/pre-commit/pre-commit-hooks.git

    rev: v3.4.0

    hooks:

      - id: check-added-large-files

      - id: check-executables-have-shebangs

      - id: check-merge-conflict

      - id: detect-private-key

      - id: check-symlinks

      - id: trailing-whitespace



  - repo: https://github.com/Yelp/detect-secrets

    rev: v0.14.3

    hooks:

      - id: detect-secrets



  - repo: https://github.com/adrienverge/yamllint

    rev: v1.16.0

    rev: v1.25.0

    hooks:

      - id: yamllint

  - repo: https://github.com/amperser/proselint



  - repo: https://github.com/amperser/proselint/

    rev: 0.10.2

    hooks:

      - id: proselint

        types: [plain-text]

        exclude: LICENSE

  - repo: https://www.shore.co.il/git/shell-pre-commit/



  - repo: https://github.com/executablebooks/mdformat.git

    rev: 0.5.3

    hooks:

      - id: mdformat



  - repo: https://git.shore.co.il/nimrod/shell-pre-commit.git

    rev: v0.6.0

    hooks:

      - id: shell-lint



  - repo: https://github.com/shellcheck-py/shellcheck-py.git

    rev: v0.7.1.1

    hooks:

      - id: shellcheck



  - repo: https://github.com/pre-commit/pre-commit.git

    rev: v2.9.3

    hooks:

      - id: validate_manifest



  - repo: local

    hooks:

      - id: hadolint
@@ -33,11 +55,3 @@ repos: 
        language: script

        entry: pre-commit-docker-wrapper

        args: [hadolint]
 
      - id: dockerfile-lint

        name: dockerfile-lint

        description: A rule based 'linter' for Dockerfiles

        minimum_pre_commit_version: '0.18.0'

        types: [dockerfile]

        language: script

        entry: pre-commit-docker-wrapper

        args: [hadolint]

Dockerfile

+0 −2
Changes for Dockerfile: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -17,5 +17,3 @@ 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

README.md

+6 −11
Changes for README.md: 6 added lines, 11 removed lines.
Original line number Diff line number Diff line 
# Docker pre-commmit



[![pipeline status](https://git.shore.co.il/nimrod/docker-pre-commit/badges/master/pipeline.svg)](https://git.shore.co.il/nimrod/docker-pre-commit/-/commits/master)



> Pre-commit hooks for Docker and docker-compose.



## Requirements
@@ -7,13 +9,6 @@ 
- [Docker](https://www.docker.com/).

- [pre-commit](https://pre-commit.com/) 0.18.0 or later.



## Hooks



- `hadolint` - The [hadolint](https://github.com/hadolint/hadolint) Dockerfile

  linter.

- `docker-compose` - Validate the Docker Compose file using `docker-compose

  config`.



## Usage example



```yaml
@@ -31,7 +26,7 @@ This software is licensed under the MIT license (see `LICENSE.txt`). 


## Author Information



Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my [website](

https://www.shore.co.il/). Patches are welcome via [`git send-email`](

http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is located

at: <https://git.shore.co.il/nimrod/>.
 
Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my

[website](https://www.shore.co.il/). Patches are welcome via

[`git send-email`](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository

is located at: <https://git.shore.co.il/expore/>.