Updated healthcheck and code-content-command

trainline-eu · Jan 17, 2018 · 86397c1 · 86397c1
1 parent a81db2e
commit 86397c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bin/code-content-command b/bin/code-content-command
@@ -4,4 +4,8 @@ if [[ $# < 3 ]]; then
   echo Expected environment, code-id, file-path >&2
   exit 1
 fi
-cd /etc/puppetlabs/code/environments/"$1" && git show "$2":"$3"
+
+# Ignore modules files which are not part of the repo anyway
+echo $3 | grep -qE "^modules/" && cat /etc/puppetlabs/code/environments/${1}/${3} && exit 0
+
+cd /etc/puppetlabs/code/environments/${1} && git show ${2}:${3}
diff --git a/docker-healthcheck.sh b/docker-healthcheck.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-curl --fail -H 'Accept: pson' \
+curl -s --fail -H 'Accept: pson' \
 --resolve 'puppet:8140:127.0.0.1' \
 --cert   $(puppet config print hostcert) \
 --key    $(puppet config print hostprivkey) \