From 91290e2a027b5d5977dbf0e17513d99d46637696 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Tue, 6 Apr 2021 21:25:38 +0300
Subject: [PATCH] add-linters

---
 .drone.yml                     | 20 +++++++++++++++++++-
 Makefile                       | 21 ++++++++++++++-------
 docker-compose.yml             |  2 ++
 etc/docker/registry/config.yml |  2 ++
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index df8d31d..c5e9f5e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,23 @@
+---
+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 etc/docker/registry/config.yml
+          - 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 +42,4 @@ trigger:
         - master
     event:
         - push
+...
diff --git a/Makefile b/Makefile
index 27d09ed..94b755a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 MAKEFLAGS += --silent
-
 .PHONY: *
 
-start:
-	docker-compose -f docker-compose.yml up -d
-down:
-	docker-compose -f docker-compose.yml down
+REGISTRY=registry.fedy95.com
+YAMLLINT_TAG=baseimage-yamllint:latest
+
+lint: lint-yaml
 
-restart: down start
+LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
+lint-yaml:
+	docker pull ${REGISTRY}/${YAMLLINT_TAG}
+	$(LINT-YAML-CMD) etc/docker/registry/config.yml
+	$(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 9a4a7f9..bd9db28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3"
 
 services:
@@ -14,3 +15,4 @@ services:
         volumes:
             - ./etc/docker/registry/config.yml:/etc/docker/registry/config.yml
             - ./var/lib/registry:/var/lib/registry
+...
diff --git a/etc/docker/registry/config.yml b/etc/docker/registry/config.yml
index cce7f7b..afb0310 100644
--- a/etc/docker/registry/config.yml
+++ b/etc/docker/registry/config.yml
@@ -1,3 +1,4 @@
+---
 version: 0.1
 log:
     fields:
@@ -16,3 +17,4 @@ health:
         enabled: true
         interval: 10s
         threshold: 3
+...
-- 
2.30.2