From 128b6424644377c926c35fe58221369f52796662 Mon Sep 17 00:00:00 2001
From: Bernhard Ehlers <b-ehlers@example.com>
Date: Wed, 5 Jul 2023 13:38:09 +0200
Subject: [PATCH] kalilinux - rebuild when image version changes

---
 .github/workflows/build-docker-images.yml | 16 ++++++++++++++++
 docker/kalilinux/Dockerfile               |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 62a99d5..70c0d28 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -93,5 +93,21 @@ jobs:
           set -f
           set -- $IMAGES
           set +f
+
+          # get image version
+          get_image_version() {
+            docker buildx imagetools inspect --format '{{json .Image}}' "$1" | \
+              sed -n 's/^ *"org\.opencontainers\.image\.version": *"\([^"]*\).*/\1/p' | \
+              head -n 1
+          }
+
+          # special treatment for kalilinux: rebuild when image version changes
+          if [ "$GITHUB_EVENT_NAME" = "schedule" ]; then
+            basever=$(get_image_version kalilinux/kali-last-release:amd64)
+            imagever=$(get_image_version gns3/kalilinux)
+            [ -z "$basever" ] || [ "$basever" = "$imagever" ] || \
+              set -- "$@" kalilinux
+          fi
+
           # use option --dir to use a subdirectory as a docker base dir
           python3 "$GITHUB_WORKSPACE/.github/bin/docker_build" --dir "docker" "$@"
diff --git a/docker/kalilinux/Dockerfile b/docker/kalilinux/Dockerfile
index 5282cf2..c1fd5a7 100644
--- a/docker/kalilinux/Dockerfile
+++ b/docker/kalilinux/Dockerfile
@@ -1,4 +1,4 @@
-FROM kalilinux/kali-rolling
+FROM kalilinux/kali-last-release
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y tshark && apt-get install -y --no-install-recommends metasploit-framework nmap hydra sqlmap telnet openssh-client dnsutils yersinia ettercap-text-only cisco-global-exploiter cisco-auditing-tool snmp dsniff dnschef fping hping3 python3-scapy\
     && rm -rf /var/lib/apt/lists/*