Merge pull request #10 from FMAOuroboros/master

Run standalone jar or war instead of jar only

.gitignore

@@ -6,5 +6,4 @@ pom.xml.releaseBackup
 pom.xml.versionsBackup
 pom.xml.next
 release.properties
-
-
+.idea
\ No newline at end of file

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 language: go
 
-go: 1.6
+go: 1.7.x
 
 install:
   - go get github.com/openshift/source-to-image

s2i/bin/run

@@ -6,5 +6,5 @@ APP_TARGET=${APP_TARGET:-target}
 echo "---> Starting Spring Boot application"
 echo "--> # APP_TARGET = $APP_TARGET"
 echo "--> # JAVA_OPTS = $JAVA_OPTS"
-echo "---> Running application from jar ($(find $APP_TARGET -name *.jar)) ..."
-java $JAVA_OPTS -jar `find $APP_TARGET -name *.jar`
+echo "---> Running application from standalone jar/war..."
+java $JAVA_OPTS -jar `find $APP_TARGET -maxdepth 1 -regex ".*\(jar\|war\)"`
\ No newline at end of file

test/run

@@ -28,7 +28,7 @@ cid_file=$($MKTEMP_EXEC -u --suffix=.cid)
 
 # Since we built the candidate image locally, we don't want S2I to attempt to pull
 # it from Docker hub
-s2i_args="--force-pull=false --loglevel=2"
+s2i_args="--pull-policy=never --loglevel=2"
 
 # Read exposed port from image meta data
 test_port="$(docker inspect --format='{{range $key, $value := .ContainerConfig.ExposedPorts }}{{$key}}{{end}}' ${IMAGE_NAME} | sed 's/\/.*//')"