From 275160bffc45a71f157a820925fe3270a88ee6cf Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Tue, 9 Mar 2021 19:25:47 +0300
Subject: [PATCH] add-yaml-validator

---
 Makefile                   | 12 +++++-------
 devops/scripts/validate.sh | 11 -----------
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100755 devops/scripts/validate.sh

diff --git a/Makefile b/Makefile
index 469722c..106ad22 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,15 @@ ifneq ("$(wildcard .env)","")
     export $(ENV_FILE)
 endif
 
-REGISTRY=registry.fedy95.com
-YAMLLINT_TAG=baseimage-yamllint:latest
+REGISTRY:=registry.fedy95.com
+YAMLLINT_TAG:=baseimage-yamllint:latest
 
 .PHONY: *
 
 validate:
-	echo $(REGISTRY)
-	docker login "$REGISTRY" -u"$REGISTRY_LOGIN" -p"$REGISTRY_PASSWORD"
-	docker pull "$REGISTRY"/"$YAMLLINT_TAG"
-	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data "$REGISTRY"/"$YAMLLINT_TAG" .
-	docker logout registry.fedy95.com
+	echo "${REGISTRY}"
+	docker login "${REGISTRY}" -u"${REGISTRY_LOGIN}" -p"${REGISTRY_PASSWORD}"
+	docker logout "${REGISTRY}"
 
 restart:
 	docker-compose -f docker-compose.yml down
diff --git a/devops/scripts/validate.sh b/devops/scripts/validate.sh
deleted file mode 100755
index 3901d74..0000000
--- a/devops/scripts/validate.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-set -a
-[ -f ../../.env ] && . ../../.env
-set +a
-
-echo "$REGISTRY"
-echo "${REGISTRY}"
-echo "${{REGISTRY}}"