Bump image version + printing versions

.github/workflows/build-and-publish.yml

@@ -26,6 +26,9 @@ jobs:
       - name: Checkout current repo
         uses: actions/checkout@v4
 
+      - name: Set package version
+        run: sed -E -i "s/^__version__ = \"[a-z0-9\.]+\"/__version__ = \"$VERSION\"/g"  ${REPOSITORY}/version.py
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM nvidia/cuda:12.1.0-devel-ubuntu22.04
+FROM nvidia/cuda:12.2.2-devel-ubuntu22.04
 
 LABEL com.nvidia.volumes.needed="nvidia_driver"
 
@@ -59,4 +59,5 @@ ADD hashcat_wrapper.py .
 COPY requirements.txt .
 RUN pip3 install -r /root/requirements.txt && rm /root/requirements.txt
 
+#CMD ["top"]
 ENTRYPOINT ["python3", "/root/hashcat_wrapper.py"]

hashcat_wrapper.py

@@ -12,6 +12,8 @@
 import time
 import requests
 
+__version__ = "0.0.0dev"
+
 EXEC = "hashcat"
 TMP_DIR = "/tmp"
 NTFY_TOPIC = os.environ["NTFY_TOPIC"]
@@ -22,7 +24,7 @@
 OUT_FILE = os.path.join(TMP_DIR, "hashcat.out")
 UPDATE_INTERVAL = 10
 STATUS = f"--quiet --status --status-json --status-timer={UPDATE_INTERVAL} --outfile {OUT_FILE}"
-HASH_TARGET = None # Can be hash string or hashes file
+HASH_TARGET = None  # Can be hash string or hashes file
 
 DISABLE_NTFY = True if os.environ.get("DISABLE_NTFY", "").lower() == "true" else False
 
@@ -183,5 +185,6 @@ def main() -> int:
 
 if __name__ == "__main__":
     ntfy_status = "ntfy is disabled" if DISABLE_NTFY else ""
-    logging.info(f"Starting Hashcat wrapper {ntfy_status}")
+    hashcat_version = subprocess.getoutput(f"{EXEC} --version")
+    logging.info(f"Starting Hashcat wrapper version: {__version__} (hashcat version: {hashcat_version}) {ntfy_status}")
     send_ntfy(f"Finished on host {socket.gethostname()} (error code: {main()}")