From 9ea156b055c3722d8370aea2872db222adb6587c Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Tue, 30 Mar 2021 18:17:13 +0300
Subject: [PATCH] cleanup

---
 .drone.yml |  4 ++--
 Makefile   | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d427ef9..32e3d02 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,13 +10,13 @@ volumes:
       path: /var/run/docker.sock
 
 steps:
-  - name: validate yaml
+  - name: lint yaml
     image: registry.fedy95.com/baseimage-yamllint:latest
     commands:
       - yamllint -c /yamllint/relaxed.yaml .
     when:
       event: pull_request
-  - name: validate json
+  - name: lint json
     image: registry.fedy95.com/baseimage-jsonlint:latest
     commands:
       - find . -name "*.json" | xargs -n 1 jsonlint -qc
diff --git a/Makefile b/Makefile
index 4a7ed42..23e21bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,23 @@
 MAKEFLAGS += --silent
-
 .PHONY: *
 
-REPOSITORY=fedy95/baseimage:jsonlint
-TAG=latest
+LOCAL_REPOSITORY=fedy95/baseimage:jsonlint
+JSONLINT_TAG=latest
+
+REGISTRY=registry.fedy95.com
+YAMLLINT_TAG=baseimage-yamllint:latest
+
+lint: lint-json lint-yaml
 
-build_jsonlint:
-	docker build -t ${REPOSITORY}-${TAG} image -f image/Dockerfile
+build-jsonlint:
+	docker build -t ${LOCAL_REPOSITORY}/${TAG} image -f image/Dockerfile
+lint-json: build-jsonlint
+	docker run --rm -it -v $(PWD):/data ${LOCAL_REPOSITORY}-${JSONLINT_TAG} -qc tests/general.json
+lint-json-help: build-jsonlint
+	docker run --rm -it -v $(PWD):/data ${LOCAL_REPOSITORY}-${JSONLINT_TAG} --help
 
-lint: build_jsonlint
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data ${REPOSITORY}-${TAG} -qc tests/general.json
-lint_help: build_jsonlint
-	docker run --rm -v $(pwd):/data ${REPOSITORY}-${TAG} --help
+lint-yaml:
+	docker pull "${REGISTRY}"/"${YAMLLINT_TAG}"
+	docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" .
 
 .DEFAULT_GOAL := lint