aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2019-05-28 01:05:03 -0300
committerEuAndreh <eu@euandre.org>2019-05-28 01:07:16 -0300
commitd2e583f5ee786c3e3f0077aeed1df59ce39fa467 (patch)
tree3a743e0fa1170b69a00dbd2e028e57591a2b30f1
parentFix Nextcloud image name (diff)
downloadserver-d2e583f5ee786c3e3f0077aeed1df59ce39fa467.tar.gz
server-d2e583f5ee786c3e3f0077aeed1df59ce39fa467.tar.xz
Fix docker-compose config step
Add gitMinimal package to baseTasks to allow any derivation to =source .envrc= freely. dockerComposeLint sources it to properly lint the file that will be ran.
-rw-r--r--default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/default.nix b/default.nix
index afbb8d1..c110c7c 100644
--- a/default.nix
+++ b/default.nix
@@ -14,7 +14,7 @@ let
name = "vps-task";
src = rootSrc;
phases = "unpackPhase buildPhase";
- buildInputs = [ ];
+ buildInputs = [ pkgs.gitMinimal ];
buildPhase = ''
echo "ERROR: base task buildPhase not overriden."
exit 1
@@ -60,6 +60,7 @@ with pkgs.stdenv; rec {
name = "${baseAttrs.name}-docker-compose-lint";
buildInputs = baseAttrs.buildInputs ++ [ docker-compose ];
buildPhase = ''
+ source .envrc
docker-compose config || {
echo "Invalid docker-compose.yml file."
exit 1