From 2e6056219ccc105b35fa033557d970ed528fe41f Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Tue, 6 Apr 2021 22:19:19 +0300
Subject: [PATCH] add-linters

---
 .drone.yml         |  51 +++++++++-----
 Makefile           |  13 +++-
 docker-compose.yml | 168 +++++++++++++++++++++++----------------------
 3 files changed, 130 insertions(+), 102 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 044bcdb..08d8045 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,27 +1,44 @@
+---
+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
+  disable: true
 
 server:
-    host:
-        from_secret: host
-    user:
-        from_secret: user
-    password:
-        from_secret: password
+  host:
+    from_secret: host
+  user:
+    from_secret: user
+  password:
+    from_secret: password
 
 steps:
-    - name: release
-      commands:
-          - cd /mnt/md0/infra/gitea
-          - git pull
-          - echo 'need manual restart'
+  - name: release
+    commands:
+      - cd /mnt/md0/infra/gitea
+      - git pull
+      - echo 'need manual restart'
 
 trigger:
-    branch:
-        - master
-    event:
-        - push
+  branch:
+    - 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 b983b7a..97b4b12 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,86 +1,88 @@
+---
 version: "3"
 
 services:
-    gitea_db:
-        image: mariadb:10
-        container_name: gitea_db
-
-        hostname: gitea_db
-        restart: unless-stopped
-
-        env_file:
-            - ./.env-gitea_db
-
-        volumes:
-            - ./etc/gitea_db/data:/var/lib/mysql
-    gitea_drone:
-        image: drone/drone:1.9
-        container_name: gitea_drone
-
-        hostname: gitea_drone
-        restart: always
-        depends_on:
-            - gitea_drone_db
-
-        env_file:
-            - ./.env-gitea_drone
-        ports:
-            - "2999:80"
-
-        volumes:
-            - ./etc/gitea_drone/data:/data
-    gitea_drone_db:
-        image: postgres:13-alpine
-        container_name: gitea_drone_db
-
-        hostname: gitea_drone_db
-        restart: unless-stopped
-
-        env_file:
-            - ./.env-gitea_drone_db
-
-        volumes:
-            - ./etc/gitea_drone_db/data:/var/lib/postgresql/data
-    gitea_drone_agent_ssh:
-        image: drone/drone-runner-ssh:1.0.1
-        container_name: gitea_drone_agent_ssh
-
-        hostname: gitea_drone_agent_ssh
-        restart: always
-        depends_on:
-            - gitea_drone
-
-        env_file:
-            - .env-gitea_drone_agent_ssh
-    gitea_drone_agent_docker:
-        image: drone/drone-runner-docker:1.6.3
-        container_name: gitea_drone_agent_docker
-
-        hostname: gitea_drone_agent_docker
-        restart: always
-        depends_on:
-            - gitea_drone
-
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
-        env_file:
-            - .env-gitea_drone_agent_docker
-    gitea_instance:
-        image: gitea/gitea:1.13.3
-        container_name: gitea_instance
-
-        hostname: gitea_instance
-        restart: always
-        depends_on:
-            - gitea_db
-
-        env_file:
-            - ./.env-gitea_instance
-        ports:
-            - "222:22"
-            - "3000:3000"
-
-        volumes:
-            - ./etc/gitea_instance/data:/data
-            - /etc/timezone:/etc/timezone:ro
-            - /etc/localtime:/etc/localtime:ro
+  gitea_db:
+    image: mariadb:10
+    container_name: gitea_db
+
+    hostname: gitea_db
+    restart: unless-stopped
+
+    env_file:
+      - ./.env-gitea_db
+
+    volumes:
+      - ./etc/gitea_db/data:/var/lib/mysql
+  gitea_drone:
+    image: drone/drone:1.9
+    container_name: gitea_drone
+
+    hostname: gitea_drone
+    restart: always
+    depends_on:
+      - gitea_drone_db
+
+    env_file:
+      - ./.env-gitea_drone
+    ports:
+      - "2999:80"
+
+    volumes:
+      - ./etc/gitea_drone/data:/data
+  gitea_drone_db:
+    image: postgres:13-alpine
+    container_name: gitea_drone_db
+
+    hostname: gitea_drone_db
+    restart: unless-stopped
+
+    env_file:
+      - ./.env-gitea_drone_db
+
+    volumes:
+      - ./etc/gitea_drone_db/data:/var/lib/postgresql/data
+  gitea_drone_agent_ssh:
+    image: drone/drone-runner-ssh:1.0.1
+    container_name: gitea_drone_agent_ssh
+
+    hostname: gitea_drone_agent_ssh
+    restart: always
+    depends_on:
+      - gitea_drone
+
+    env_file:
+      - .env-gitea_drone_agent_ssh
+  gitea_drone_agent_docker:
+    image: drone/drone-runner-docker:1.6.3
+    container_name: gitea_drone_agent_docker
+
+    hostname: gitea_drone_agent_docker
+    restart: always
+    depends_on:
+      - gitea_drone
+
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    env_file:
+      - .env-gitea_drone_agent_docker
+  gitea_instance:
+    image: gitea/gitea:1.13.3
+    container_name: gitea_instance
+
+    hostname: gitea_instance
+    restart: always
+    depends_on:
+      - gitea_db
+
+    env_file:
+      - ./.env-gitea_instance
+    ports:
+      - "222:22"
+      - "3000:3000"
+
+    volumes:
+      - ./etc/gitea_instance/data:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+...