fix CI scripts

bin/CI-docker/java/Dockerfile

@@ -2,15 +2,23 @@ FROM maven:3.6.3-jdk-11
 
 MAINTAINER S. Koulouzis
 
+ARG SONAR_PROPERTIES_FILE=uva-conf.properties
+
+# Install SonarQube Dependency
+RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip && \
+    unzip sonar-scanner-cli-4.2.0.1873-linux.zip && \
+    mv sonar-scanner-4.2.0.1873-linux /opt/sonar-scanner
+
 COPY clone_git.sh clone_git.sh
 COPY build.sh build.sh
 COPY send_to_sonarqube.sh send_to_sonarqube.sh 
+COPY ${SONAR_PROPERTIES_FILE} ${SONAR_PROPERTIES_FILE}
 
 CMD ./clone_git.sh $BRANCH $GIT_URL $FOLDER_NAME && \ 
     ./build.sh $FOLDER_NAME && \
-    ./send_to_sonarqube.sh $FOLDER_NAME $SONAR_HOST $SONAR_LOGIN
+    ./send_to_sonarqube.sh $FOLDER_NAME $SONAR_HOST $SONAR_LOGIN $SONAR_PROPERTIES_FILE
     
     
     
-# docker build -t java_ci .
-# docker run -it --cpus=".5" --memory=2000m -e BRANCH=develop -e GIT_URL=https://gitlab.articonf.eu:4430/uva/conf.git -e FOLDER_NAME=conf -e SONAR_HOST=host -e SONAR_LOGIN=secret java_ci
+# docker build -t java_ci -build-arg SONAR_PROPERTIES_FILE=uva-conf.properties .
+# docker run -it -e BRANCH=develop -e GIT_URL=https://gitlab.articonf.eu:4430/uva/conf.git -e FOLDER_NAME=conf -e SONAR_HOST=https://sonar.articonf.eu/ -e SONAR_LOGIN= -e SONAR_PROPERTIES_FILE=uva-conf.properties -e FOLDER_NAME=conf java_ci

bin/CI-docker/java/build.sh

@@ -8,4 +8,3 @@ cd $SRC
 mvn -Dmaven.test.skip=true install
 status=$?
 [ $status -eq 0 ] && echo "build successful" || exit -1
-

bin/CI-docker/java/clone_git.sh

@@ -5,4 +5,4 @@ BRANCH=$1
 GIT_URL=$2
 FOLDER_NAME=$3
 
-git clone -b $BRANCH $GIT_URL
+git clone -b $BRANCH $GIT_URL $FOLDER_NAME

bin/CI-docker/java/send_to_sonarqube.sh

 #!/bin/bash
 
-
-SRC=$1
+FOLDER_NAME=$1
 SONAR_HOST=$2
 SONAR_LOGIN=$3
+SONAR_PROPERTIES_FILE=$4
 
-
-cd $SRC
-
-for i in $(find . -name target); do
-    echo "Sending $i"
-done
+/opt/sonar-scanner/bin/sonar-scanner -X -e -D sonar.host.url=$SONAR_HOST -D sonar.projectBaseDir=$FOLDER_NAME -D project.settings=$SONAR_PROPERTIES_FILE -D sonar.login=$SONAR_LOGIN