4 files changed, 9 insertions, 7 deletions
diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci
index 6407c2b3d16..0bd34978621 100644
--- a/docker/Dockerfile.ci
+++ b/docker/Dockerfile.ci
@@ -1,8 +1,7 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 FROM vespabuild
 
-COPY vespa-ci-internal.sh /vespa-ci-internal.sh
 COPY tmp/vespa.spec /vespa.spec
-
 RUN yum-builddep -y /vespa.spec
 
 # Build using non-root user 'vespabuilder'
@@ -12,3 +11,5 @@ USER vespabuilder
 
 # Java requires proper locale for unicode
 ENV LANG en_US.UTF-8
+
+COPY vespa-ci-internal.sh /vespa-ci-internal.sh
diff --git a/docker/Dockerfile.run b/docker/Dockerfile.run
index 962ec7a07e2..4116b12a00d 100644
--- a/docker/Dockerfile.run
+++ b/docker/Dockerfile.run
@@ -1,3 +1,4 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 FROM centos:7
 ARG VESPA_VERSION
 
diff --git a/docker/vespa-ci-internal.sh b/docker/vespa-ci-internal.sh
index cd3690e3186..1e5446f2905 100755
--- a/docker/vespa-ci-internal.sh
+++ b/docker/vespa-ci-internal.sh
@@ -13,16 +13,16 @@ GIT_COMMIT=$1
 SOURCE_DIR=~/vespa
 BUILD_DIR=~/build
 NUM_CORES=$(nproc --all)
-NUM_THREADS=$((${NUM_CORES} + ${NUM_CORES}/2))
+NUM_THREADS=$((${NUM_CORES} * 2))
 
 mkdir "${SOURCE_DIR}"
 mkdir "${BUILD_DIR}"
 git clone --no-checkout --local --no-hardlinks file:///vespa "${SOURCE_DIR}"
 cd "${SOURCE_DIR}"
-git checkout --detach ${GIT_COMMIT}
+git -c advice.detachedHead=false checkout ${GIT_COMMIT}
 source /opt/rh/devtoolset-6/enable || true
 sh ./bootstrap.sh full
-MAVEN_OPTS="-Xms512m -Xmx512m" mvn install
+MAVEN_OPTS="-Xms128m -Xmx512m" mvn -T ${NUM_THREADS} install
 cd "${BUILD_DIR}"
 cmake3 -DCMAKE_INSTALL_PREFIX=/opt/vespa \
       -DJAVA_HOME=/usr/lib/jvm/java-openjdk \
diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh
index d3d213fa87b..3e990bb2991 100755
--- a/docker/vespa-ci.sh
+++ b/docker/vespa-ci.sh
@@ -8,7 +8,7 @@ if [ $# -ne 1 ]; then
   exit 1
 fi
 
-DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
+DIR=$(dirname $(readlink -f $0))
 cd $DIR
 
 GIT_COMMIT=$1
@@ -17,7 +17,7 @@ CI_DOCKER_IMAGE="vespaci"
 
 docker build -t "$BUILD_DOCKER_IMAGE" -f Dockerfile.build .
 
-# Create a temporarily copy of the rpm spec file inside docker directory so it can be referenced by the Dockerfile
+# Create a temporary copy of the rpm spec file inside docker directory so it can be referenced by the Dockerfile
 rm -rf tmp; mkdir tmp
 cp -p ../dist/vespa.spec tmp/vespa.spec