From 60a84a712fb0a1f60f86723b191b193e0902eefd Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sat, 25 May 2019 13:40:35 -0300
Subject: Add dockerComposeLint job stage

---
 default.nix        | 19 +++++++++++++++----
 docker-compose.yml |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/default.nix b/default.nix
index d43e113..89d7f93 100644
--- a/default.nix
+++ b/default.nix
@@ -25,7 +25,7 @@ with pkgs.stdenv; rec {
   subtasks = rec {
     shellCheck = baseTask.overrideAttrs(baseAttrs: {
       name = "${baseAttrs.name}-shellcheck";
-      buildInputs = [ shellcheck ];
+      buildInputs = baseAttrs.buildInputs ++ [ shellcheck ];
       buildPhase = ''
         find . -type f -name '*.sh' | xargs shellcheck
         touch $out
@@ -33,14 +33,13 @@ with pkgs.stdenv; rec {
     });
     fixme = baseTask.overrideAttrs (baseAttrs: {
       name = "${baseAttrs.name}-fixme";
-      buildInputs = [ag];
+      buildInputs = baseAttrs.buildInputs ++ [ag];
       buildPhase = ''
         ag FIXME --ignore default.nix|| {
           touch $out
         }
       '';
     });
-    # docker lint
     formatTerraform = baseTask.overrideAttrs (baseAttrs: {
       name = "${baseAttrs.name}-format-terraform";
       buildInputs = baseAttrs.buildInputs ++ [nixfmt];
@@ -53,6 +52,17 @@ with pkgs.stdenv; rec {
         touch $out
       '';
     });
+    dockerComposeLint = baseTask.overrideAttrs (baseAttrs: {
+      name = "${baseAttrs.name}-docker-compose-lint";
+      buildInputs = baseAttrs.buildInputs ++ [ docker-compose ];
+      buildPhase = ''
+        docker-compose config || {
+          echo "Invalid docker-compose.yml file."
+          exit 1
+        }
+        touch $out
+      '';
+    });
     formatNix = baseTask.overrideAttrs (baseAttrs: {
       name = "${baseAttrs.name}-nixfmt";
       buildInputs = baseAttrs.buildInputs ++ [nixfmt];
@@ -69,9 +79,10 @@ with pkgs.stdenv; rec {
   test = baseTask.overrideAttrs (baseAttrs: rec {
     name = "${baseAttrs.name}-test";
     buildInputs = [
-      subtasks.shellcheck
+      subtasks.shellCheck
       subtasks.fixme
       subtasks.formatTerraform
+      subtasks.dockerComposeLint
       subtasks.formatNix
     ];
     buildPhase = ''
diff --git a/docker-compose.yml b/docker-compose.yml
index f7f6ab3..4df7c95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '2'
 
 services:
   proxy:
-- 
cgit v1.2.3