Merge pull request #467 from intelowlproject/develop

1.5.1

Author: mlodic

.env_template

@@ -11,3 +11,6 @@ COMPOSE_FILE=docker/default.yml:docker/local.override.yml
 
 # local development with elasticsearch container
 #COMPOSE_FILE=docker/default.yml:docker/local.override.yml:docker/elasticsearch.yml
+
+# If you want to run a specific version, populate this
+# REACT_APP_INTELOWL_VERSION="1.5.1"

.github/release_template.md

@@ -1,6 +1,6 @@
 # Checklist for creating a new release
 
-- [ ] Change version number in `docker/.version`
+- [ ] Change version number in `docker/.version` and in `.env_template`
 - [ ] Verify CI Tests
 - [ ] Verify that the PR is named with a correct version number like x.x.x
 - [ ] Merge the PR to the `main` branch. The release will be done automatically by the CI

docker/.version

@@ -1 +1 @@
-REACT_APP_GREEDYBEAR_VERSION="1.5.0"
+REACT_APP_GREEDYBEAR_VERSION="1.5.1"

docker/version.override.yml

@@ -0,0 +1,13 @@
+# you have to populate the ENV variable REACT_APP_INTELOWL_VERSION in the .env file to have this work
+services:
+  uwsgi:
+    image: intelowlproject/greedybear:${REACT_APP_INTELOWL_VERSION}
+
+  nginx:
+    image: intelowlproject/greedybear_nginx:${REACT_APP_INTELOWL_VERSION}
+
+  celery_beat:
+    image: intelowlproject/greedybear:${REACT_APP_INTELOWL_VERSION}
+
+  celery_worker_default:
+    image: intelowlproject/greedybear:${REACT_APP_INTELOWL_VERSION}

greedybear/migrations/0014_auto_20250210_1258.py

@@ -5,12 +5,15 @@
 
 def removeDdospot(apps, schema_editor):
     GeneralHoneypot = apps.get_model("greedybear", "GeneralHoneypot")
-    ddospot = GeneralHoneypot.objects.get(name__iexact="Ddospot")
-    IOC = apps.get_model("greedybear", "IOC")
-    # do nothing if Ddospot is in active use
-    if ddospot.active and IOC.objects.filter(general_honeypot=ddospot).exists():
-        return
-    ddospot.delete()
+    try:
+        ddospot = GeneralHoneypot.objects.get(name__iexact="Ddospot")
+        IOC = apps.get_model("greedybear", "IOC")
+        # do nothing if Ddospot is in active use
+        if ddospot.active and IOC.objects.filter(general_honeypot=ddospot).exists():
+            return
+        ddospot.delete()
+    except GeneralHoneypot.DoesNotExist as e:
+        pass
 
 
 class Migration(migrations.Migration):