diff --git a/.drone.yml b/.drone.yml index 038195e..ed03207 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,6 +12,12 @@ steps: - yamllint -c /yamllint/relaxed.yaml . when: event: pull_request + - name: lint json + image: registry.fedy95.com/baseimage-jsonlint:latest + commands: + - find . -name "*.json" | xargs -n 1 jsonlint -qc + when: + event: pull_request ... --- diff --git a/Makefile b/Makefile index 022a412..1be3925 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,27 @@ MAKEFLAGS += --silent REGISTRY=registry.fedy95.com YAMLLINT_TAG=baseimage-yamllint:latest +JSONLINT_TAG=baseimage-jsonlint:latest .PHONY: * -lint: lint-yaml +lint: lint-yaml lint-json lint-yaml: docker pull "${REGISTRY}"/"${YAMLLINT_TAG}" - docker run --rm -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" . + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${YAMLLINT_TAG}" . + +lint-json: + docker pull "${REGISTRY}"/"${JSONLINT_TAG}" + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/i-o-statistics.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/monitor_services.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/nexus_host.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/nginx_container.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/node-exporter.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/smart-1.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/smart-2.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/smart-3.json + docker run --rm -it -v $(PWD):/data "${REGISTRY}"/"${JSONLINT_TAG}" -qc grafana/provisioning/dashboards/smart-4.json restart: docker-compose -f docker-compose.yml down