Merge pull request #351 from groldan/dependency_convergence

Enforce dependency convergence.

.env

@@ -3,7 +3,7 @@ COMPOSE_PROJECT_NAME=gscloud
 TAG=1.3-SNAPSHOT
 GS_USER="1000:1000"
 BASE_PATH=/geoserver/cloud
-DEFAULT_PROFILES="debug"
+DEFAULT_PROFILES="default"
 EUREKA_SERVER_URL=http://discovery:8761/eureka
 JDBCCONFIG_DBNAME=geoserver_config
 JDBCCONFIG_URL=jdbc:postgresql://database:5432/${JDBCCONFIG_DBNAME}

run-trivy-image-scan.sh

@@ -7,19 +7,28 @@ v2=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
 echo Comparing $v1 vs $v2...
 echo Summary:
 
-for i in `docker images|grep geoservercloud|grep "$v2 "|sort|cut -d" " -f1`
+repo=geoservercloud
+for i in `docker images|grep geoservercloud|grep "$v2 "|sort|cut -d" " -f1|sed -e "s/$repo\///g"`
 do
   export image=$i
+  echo "----------------------------"
   echo "* $image:"
-  echo "\t\`$v1\`": $(trivy image --vuln-type library --no-progress $image:$v1 | grep Total) 
-  echo "\t\`$v2\`": $(trivy image --vuln-type library --no-progress $image:$v2 | grep Total)
+  echo "\t\`$v1\`: $(trivy image --scanners vuln --vuln-type library --no-progress $repo/$image:$v1 | grep Total)" 
+  echo "\t\`$v2\`: $(trivy image --scanners vuln --vuln-type library --no-progress $repo/$image:$v2 | grep Total)"
 done
 
-echo $v2 library vulnerabilities
-for i in `docker images|grep geoservercloud|grep "$v2 "|sort|cut -d" " -f1`
+echo "$v2 library vulnerabilities"
+
+echo writing html reports to $PWD/target
+mkdir -p target
+for i in `docker images|grep geoservercloud|grep "$v2 "|sort|cut -d" " -f1|sed -e "s/$repo\///g"`
 do
   export image=$i
-  echo "--------------------------------------------------"
-  echo "$image:"
-  trivy image --vuln-type library --no-progress -s "HIGH,CRITICAL" $image:$v2 |grep -v INFO
+  export old=$image:$v1
+  export new=$image:$v2
+  trivy image --scanners vuln --vuln-type library --format template --template "@/usr/local/share/trivy/templates/html.tpl" -o target/$old.html $repo/$old
+  trivy image --scanners vuln --vuln-type library --format template --template "@/usr/local/share/trivy/templates/html.tpl" -o target/$new.html $repo/$new
 done
+
+
+