From 3a8165802cc02ea50bf1cf111f69808ca4f2d7a7 Mon Sep 17 00:00:00 2001
From: Jannik Hollenbach <13718901+J12934@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:32:43 +0200
Subject: [PATCH 1/3] Update nmap scanner to newer alpine version

---
 .github/workflows/ci.yaml        | 2 +-
 scanners/nmap/Chart.yaml         | 2 +-
 scanners/nmap/scanner/Dockerfile | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7a5989c3..ded45c22 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -272,7 +272,7 @@ jobs:
           repository: scbexperimental/nmap
           path: ./scanners/nmap/scanner/
           # Note: not prefixed with a "v" as this seems to match nmap versioning standards
-          tags: "7.80,7.80-1,latest"
+          tags: "7.80,7.80-2,latest"
       - uses: docker/build-push-action@v1
         name: "Build & Push kube-hunter Scanner Image"
         with:
diff --git a/scanners/nmap/Chart.yaml b/scanners/nmap/Chart.yaml
index f9ce58a5..92e0155c 100644
--- a/scanners/nmap/Chart.yaml
+++ b/scanners/nmap/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for the NMAP security Scanner that integrates with the
 
 type: application
 version: 0.1.0
-appVersion: 0.2.0
+appVersion: 7.80-r2
 
 keywords:
 - security
diff --git a/scanners/nmap/scanner/Dockerfile b/scanners/nmap/scanner/Dockerfile
index 54868e41..8f138612 100644
--- a/scanners/nmap/scanner/Dockerfile
+++ b/scanners/nmap/scanner/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine:3.11
-RUN apk add --no-cache nmap=7.80-r1 nmap-scripts=7.80-r1
+FROM alpine:3.12
+RUN apk add --no-cache nmap=7.80-r2 nmap-scripts=7.80-r2
 RUN addgroup -S nmap && adduser -S -g nmap nmap
 USER nmap
 CMD [nmap]
\ No newline at end of file

From d7dc437d9089c733d766346b487737384600cb27 Mon Sep 17 00:00:00 2001
From: Jannik Hollenbach <13718901+J12934@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:35:12 +0200
Subject: [PATCH 2/3] Update to SSLyze 3.0.6

Newer SSLyze versions (3.0.8) aren't yet pushed to docker hub...
---
 scanners/sslyze/Chart.yaml                      | 2 +-
 scanners/sslyze/templates/sslyze-scan-type.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scanners/sslyze/Chart.yaml b/scanners/sslyze/Chart.yaml
index db5f4f39..4e9cc892 100644
--- a/scanners/sslyze/Chart.yaml
+++ b/scanners/sslyze/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for the SSLyze security scanner that integrates with t
 
 type: application
 version: 0.1.0
-appVersion: latest
+appVersion: 3.0.6
 
 keywords:
 - security
diff --git a/scanners/sslyze/templates/sslyze-scan-type.yaml b/scanners/sslyze/templates/sslyze-scan-type.yaml
index e16aa926..a0c02089 100644
--- a/scanners/sslyze/templates/sslyze-scan-type.yaml
+++ b/scanners/sslyze/templates/sslyze-scan-type.yaml
@@ -14,7 +14,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: sslyze
-              image: nablac0d3/sslyze@sha256:591d8626c7952788d5aa3946a60146d039c1582bc31aea6f9989500ebb5cc222
+              image: nablac0d3/sslyze@sha256:ff2c5c626401b1961736a5b2ae6e35a41d213e8b2712102100abf5ee46dcca71
               command:
                 - 'sslyze'
                 - '--json_out'

From 2ab3fcd88b8dfcd8ae206cd350e591b759bf2be6 Mon Sep 17 00:00:00 2001
From: Jannik Hollenbach <13718901+J12934@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:36:32 +0200
Subject: [PATCH 3/3] Update to amass 3.7.2

---
 scanners/amass/Chart.yaml                     | 2 +-
 scanners/amass/templates/amass-scan-type.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scanners/amass/Chart.yaml b/scanners/amass/Chart.yaml
index 1e42a7ca..9fe512d0 100644
--- a/scanners/amass/Chart.yaml
+++ b/scanners/amass/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for the Amass security scanner that integrates with th
 
 type: application
 version: 0.1.0
-appVersion: 3.7.1
+appVersion: 3.7.2
 
 keywords:
   - security
diff --git a/scanners/amass/templates/amass-scan-type.yaml b/scanners/amass/templates/amass-scan-type.yaml
index 02c107cb..794c3657 100644
--- a/scanners/amass/templates/amass-scan-type.yaml
+++ b/scanners/amass/templates/amass-scan-type.yaml
@@ -16,7 +16,7 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: amass
-              image: caffix/amass:v3.7.1
+              image: caffix/amass:v3.7.2
               command:
                 - "amass"
                 - "enum"