Merge pull request #50 from rtyler/make-check

Run the `check` target in the Test stage

Jenkinsfile

@@ -40,7 +40,7 @@ pipeline {
         }
         stage('Test') {
             steps {
-                echo 'Maybe rtyler will write some tests'
+                sh 'make check'
             }
         }
     }

proxy/Makefile

@@ -1,7 +1,7 @@
 IMAGE=rtyler/codevalet-proxy
 
 check: container
-	docker run --rm -ti \
+	docker run --rm \
 		-e JENKINS_CODEVALET_SERVICE_HOST=127.0.1.1 \
 		-e JENKINS_CODEVALET_SERVICE_PORT=80 \
 		-e JENKINS_FOOBAR_SERVICE_HOST=127.0.2.1 \

webapp/scripts/ruby

@@ -1,6 +1,13 @@
 #!/bin/sh
 
-exec docker run --rm -ti \
+# If we're executing from a normal shell, allow input. If we're in a
+# subprocess, like under Jenkins Pipeline, don't allow it
+tty --quiet
+if [ $? -eq 0 ]; then
+    TTY_ARGS="-ti"
+fi;
+
+exec docker run --rm ${TTY_ARGS} \
     -u $(id -u):$(id -g) \
     -w ${PWD} \
     -v ${PWD}:${PWD} \