add-linters #7

Merged
fedy95 merged 1 commits from add-linters into master 4 years ago
  1. 20
      .drone.yml
  2. 21
      Makefile
  3. 2
      docker-compose.yml
  4. 2
      etc/docker/registry/config.yml

20
.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
...

21
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

2
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
...

2
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
...