fix release images, fix license checker (arkime#2503)

release/notice.txt.pl

@@ -15,10 +15,9 @@ sub handle {
 }
 
 my %DONE;
-my $topJson = from_json(`license-checker --production --json`);
-my $parliamentJson = from_json(`cd $ARGV[0]/parliament; license-checker --production --json`);
-my $viewerJson = from_json(`cd $ARGV[0]/viewer; license-checker --production --json`);
-my $wiseServiceJson = from_json(`cd $ARGV[0]/wiseService; license-checker --production --json`);
+my $topJson = from_json(`npx license-checker --production --json`);
+my $viewerJson = from_json(`cd $ARGV[0]/viewer; npx license-checker --production --json`);
+my $cont3xtJson = from_json(`cd $ARGV[0]/cont3xt; npx license-checker --production --json`);
 
 shift @ARGV;
 
@@ -31,18 +30,13 @@ sub handle {
     handle($key, $topJson->{$key});
 }
 
-for my $key (keys %$parliamentJson) {
-    $DONE{$key} = 1;
-    handle($key, $parliamentJson->{$key});
-}
-
 for my $key (keys %$viewerJson) {
     $DONE{$key} = 1;
     handle($key, $viewerJson->{$key});
 }
 
-for my $key (keys %$wiseServiceJson) {
+for my $key (keys %$cont3xtJson) {
     next if ($DONE{$key} == 1);
     $DONE{$key} = 1;
-    handle($key, $wiseServiceJson->{$key});
+    handle($key, $cont3xtJson->{$key});
 }

screwdriver.yaml

@@ -373,7 +373,7 @@ jobs:
 
     release-centos-7:
         requires: [release-build]
-        image: andywick/arkime-build-7:5.0.0-2
+        image: andywick/arkime-build-7:5.0.0-3
         steps:
             - (cd / ; curl https://s3.amazonaws.com/files.molo.ch/snfmin.tar.gz | tar -zxvf -)
             - ln -s /thirdparty .
@@ -542,7 +542,7 @@ jobs:
 
     release-arch:
         requires: [release-build]
-        image: andywick/arkime-build-arch:5.0.0-3
+        image: andywick/arkime-build-arch:5.0.0-2
         steps:
             - (cd / ; curl https://s3.amazonaws.com/files.molo.ch/snfmin.tar.gz | tar -zxvf -)
             - build: ./easybutton-build.sh --rminstall