Merge pull request #31 from microservices-demo/cp-command-issue

cp command was causing issues on mac

Author: vlal

.gitignore

@@ -114,3 +114,6 @@ weave-ecs-demo-key.pem
 
 # Ignore Vagrant cache files
 *.vagrant/
+
+# Ignore jar files
+orders.jar

.travis.yml

@@ -11,7 +11,7 @@ env:
 
 script:
   - set -e
-  - ./scripts/build.sh;
+  - sudo ./scripts/build.sh;
   - travis_wait ./test/test.sh unit.py
   - ./test/test.sh component.py
   - docker build -t weaveworksdemos/json-server ./test/json-server/

scripts/build.sh

@@ -23,10 +23,10 @@ else
 fi
 CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
-$DOCKER_CMD run -u 1000 --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn -DskipTests package
+$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn -DskipTests package
 
-cp $CODE_DIR/docker $CODE_DIR/target/docker/ -rf
-cp $CODE_DIR/target/*.jar $CODE_DIR/target/docker/${IMAGE} -rf
+cp -r $CODE_DIR/docker $CODE_DIR/target/docker/
+cp -r $CODE_DIR/target/*.jar $CODE_DIR/target/docker/${IMAGE}
 
 REPO=${GROUP}/${IMAGE}
     $DOCKER_CMD build -t ${REPO}:${COMMIT} $CODE_DIR/target/docker/${IMAGE};