From 233ee2e5ddf4ac737c0af91f45eaac8b96c3774c Mon Sep 17 00:00:00 2001 From: fedy95 Date: Tue, 6 Apr 2021 21:16:37 +0300 Subject: [PATCH] add-linters --- .drone.yml | 19 ++++++++++++++++++- Makefile | 13 +++++++++++-- docker-compose.yml | 2 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7991b6f..95ac048 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,22 @@ +--- +kind: pipeline +type: docker +name: pull_request +image_pull_secrets: + - dockerconfigjson + +steps: + - name: lint yaml + image: registry.fedy95.com/baseimage-yamllint:latest + commands: + - yamllint -c /yamllint/relaxed.yaml docker-compose.yml + when: + event: pull_request + +--- kind: pipeline type: ssh -name: default +name: master_push clone: disable: true @@ -25,3 +41,4 @@ trigger: - master event: - push +... diff --git a/Makefile b/Makefile index a3170a5..518ac6c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,18 @@ MAKEFLAGS += --silent - .PHONY: * +REGISTRY=registry.fedy95.com +YAMLLINT_TAG=baseimage-yamllint:latest + +lint: lint-yaml + +LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG} +lint-yaml: + docker pull ${REGISTRY}/${YAMLLINT_TAG} + $(LINT-YAML-CMD) docker-compose.yml + restart: docker-compose -f docker-compose.yml down docker-compose -f docker-compose.yml up -d -.DEFAULT_GOAL := restart +.DEFAULT_GOAL := lint diff --git a/docker-compose.yml b/docker-compose.yml index bac8e72..71161c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: "3" services: keeweb: @@ -8,3 +9,4 @@ services: ports: - "3005:443" +...