From 03c043b9d26ef402ad9899b764cd92f6dd4dcb91 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Wed, 12 May 2021 21:16:52 +0300
Subject: [PATCH] add-deploy

---
 .drone.yml                     | 42 ++++++++++++++++++++++++++++++++++
 .editorconfig                  |  8 ++++---
 Dockerfile                     |  8 +++----
 Makefile                       | 24 ++++++++++++-------
 README.md                      |  5 +++-
 deployments/docker-compose.yml |  2 ++
 go.mod                         |  3 +++
 7 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 .drone.yml
 create mode 100644 go.mod

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..ebe90b4
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,42 @@
+---
+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 deployments/docker-compose.yml
+    when:
+      event: pull_request
+---
+kind: pipeline
+type: ssh
+name: master_push
+clone:
+  disable: true
+server:
+  host:
+    from_secret: host
+  user:
+    from_secret: user
+  password:
+    from_secret: password
+steps:
+  - name: release
+    commands:
+      - cd /home/fedy95/dev/news-aggregator-back
+      - git pull
+      - make restart
+  - name: cleanup
+    commands:
+      - cd /home/fedy95/dev/news-aggregator-back
+      - make cleanup
+trigger:
+  branch:
+    - master
+  event:
+    - push
+...
diff --git a/.editorconfig b/.editorconfig
index 9141329..73069d4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,10 @@
 root = true
 
 [*]
-end_of_line = lf
-insert_final_newline = true
 charset = utf-8
+end_of_line = lf
 indent_style = space
-indent_size = 4
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 100
diff --git a/Dockerfile b/Dockerfile
index 7c26cd0..423494f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM golang:alpine as golang
+FROM golang:1.16.4-alpine
 
-COPY app /app
-WORKDIR /app
+ADD . /build
+WORKDIR /build/app
 
 RUN go build -o main .
-CMD ["/app/main"]
+CMD ["/build/app/main"]
diff --git a/Makefile b/Makefile
index 0b144a9..0efbda3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
 MAKEFLAGS += --silent
-
 .PHONY: *
 
-build:
-	docker-compose --file deployments/docker-compose.yml --project-name news-aggregator-back build
+REGISTRY=registry.fedy95.com
+YAMLLINT_TAG=baseimage-yamllint:latest
+
+lint: lint-yaml
 
-start: build
+LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
+lint-yaml:
+	docker pull ${REGISTRY}/${YAMLLINT_TAG}
+	$(LINT-YAML-CMD) deployments/docker-compose.yml
+
+restart:
+	docker-compose --file deployments/docker-compose.yml --project-name news-aggregator-back build
+	docker-compose --file deployments/docker-compose.yml --project-name news-aggregator-back stop
 	docker-compose --file deployments/docker-compose.yml --project-name news-aggregator-back up -d
-down:
-	docker-compose --file deployments/docker-compose.yml --project-name news-aggregator-back down
 
-restart: down start
+cleanup:
+	docker system prune --all --force
+	docker system prune --volumes --force
 
-.DEFAULT_GOAL := restart
+.DEFAULT_GOAL := lint
diff --git a/README.md b/README.md
index a9a7ec2..8b48c47 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,4 @@
-# news-aggregator-back
+### news-aggregator-back [![Build Status](https://drone.fedy95.com/api/badges/dev/news-aggregator-back/status.svg)](https://drone.fedy95.com/dev/news-aggregator-back)
+
+---
+
diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml
index 6c5dd2e..841bd64 100644
--- a/deployments/docker-compose.yml
+++ b/deployments/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3.8"
 
 services:
@@ -10,3 +11,4 @@ services:
 
         ports:
             - "7070:7070"
+...
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..588d522
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module gitea.fedy95.com/dev/news-aggregator-back
+
+go 1.16.4