test1

Author: PhilipAbed

Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8-jdk
 RUN mkdir /wss-scan
 COPY wss-runner.sh /wss-scan
+COPY run_latest_jar.sh /wss-scan
 RUN chmod +x /wss-scan/wss-runner.sh
+RUN chmod +x /wss-scan/run_latest_jar.sh
 CMD /wss-scan/wss-runner.sh $API_KEY $PROJECT_NAME $INSTALL_COMMANDS $CONFIG_FILE $PROJECT_DIRECTORY

wss-runner.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
-echo "echo printing env"
-env
+
 echo ""
 LOCAL_INSTALL_FILE="install-commands.sh"
 echo "*******************************************************************************************************************"
@@ -10,19 +9,11 @@ echo ""
 
 if [[ -f ${COMMANDS_FILE_PATH} ]]
 then
-    echo "Executing file: $COMMANDS_FILE_PATH"
+    echo "Executing file: ${COMMANDS_FILE_PATH}"
     echo ""
     ./${COMMANDS_FILE_PATH}
 else
-    echo "Couldn't find file $COMMANDS_FILE_PATH trying to download file from  URL"
-	curl -LJO ${COMMANDS_FILE_PATH}
-	if [[ -f ${LOCAL_INSTALL_FILE} ]]
-	then
-		chmod +x ${LOCAL_INSTALL_FILE}
-		./${LOCAL_INSTALL_FILE}
-	else
-		echo "unable to download or find file from ${COMMANDS_FILE_PATH}, skipping ${LOCAL_INSTALL_FILE} file"
-	fi
+    echo "Couldn't find file $COMMANDS_FILE_PATH , Skipping installing extra commands before running scan"
 fi
 
 echo ""
@@ -40,15 +31,15 @@ echo ""
 
 DIRECTORY=${DIRECTORY:="."}
 API_KEY=${API_KEY}
-CONFIG_FILE_PATH=${CONFIG_FILE_PATH:="wss-unified-agent.config"}
+CONFIG_FILE_PATH=${CONFIG_FILE_PATH:="/codefresh/volume/wss-unified-agent.config"}
 
 if [[ -z "${API_KEY}" ]]; then
-    bash <(curl -s -L https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss_agent_scanner.sh) -c "${CONFIG_FILE_PATH}" -d "${DIRECTORY}"
+    ./wss-scan/run_latest_jar.sh -c "${CONFIG_FILE_PATH}" -d "${DIRECTORY}"
 else
-    bash <(curl -s -L https://github.com/whitesource/unified-agent-distribution/raw/master/standAlone/wss_agent_scanner.sh) -apiKey "${API_KEY}" -c "${CONFIG_FILE_PATH}" -d "${DIRECTORY}"
+    ./wss-scan/run_latest_jar.sh -apiKey "${API_KEY}" -c "${CONFIG_FILE_PATH}" -d "${DIRECTORY}"
 fi
 
 echo ""
 echo "*******************************************************************************************************************"
 echo "				Finish Running WhiteSource Unified Agent       "
-echo "*******************************************************************************************************************"
+echo "*******************************************************************************************************************"