Merge pull request #189 from pablosnt/develop

Release 1.5.1
pablosnt · Mar 10, 2023 · 4ecef4c · 4ecef4c
2 parents 721b7ad + e7a80aa
commit 4ecef4c
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.1] - 2023-03-10
+
+### Fixed
+
+- Error during `executions-worker` build in Docker (https://github.com/pablosnt/rekono/issues/184)
+- Error during database migration in Docker (https://github.com/pablosnt/rekono/issues/183)
+
+
 ## [1.5.0] - 2023-03-08
 
 ### Added

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,11 @@ services:
     user: postgres
     expose:
       - 5432
+    healthcheck:
+      test: pg_isready
+      interval: 10s
+      timeout: 3s
+      retries: 10
     volumes:
       - postgres:/var/lib/postgresql/data/
     networks:
@@ -31,7 +36,7 @@ services:
 
   initialize:
     restart: 'no'
-    image: rekono-backend:latest
+    image: rekono-kali:latest
     command: sh -c "python manage.py migrate && python manage.py createsuperuser --no-input"
     container_name: initialize
     volumes:
@@ -40,7 +45,8 @@ services:
     networks:
       - internal
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       - RKN_DB_HOST=postgres
       - RKN_DB_USER=postgres
@@ -77,7 +83,7 @@ services:
       context: .
       dockerfile: docker/kali/Dockerfile
     image: rekono-kali:latest
-    command: sh -c "python manage.py migrate && python manage.py rqworker executions-queue"
+    command: python manage.py rqworker executions-queue
     hostname: executions-worker
     volumes:
       - rekono:/rekono
@@ -217,8 +223,6 @@ services:
       - 3000
     networks:
       - internal
-    depends_on:
-      - initialize
     environment:
       - NODE_OPTIONS=--openssl-legacy-provider
 

diff --git a/docker/kali/Dockerfile b/docker/kali/Dockerfile
@@ -10,7 +10,7 @@ COPY requirements.txt /code
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-RUN apt update && apt install python3-pip libpq-dev python3-dev libmagic1 libcap2-bin -y
+RUN apt update -y && apt upgrade -y && apt dist-upgrade -y && apt install python3-pip libpq-dev python3-dev libmagic1 libcap2-bin -y
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
 RUN pip install --upgrade pip

diff --git a/rekono/frontend/package-lock.json b/rekono/frontend/package-lock.json
diff --git a/rekono/frontend/package.json b/rekono/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rekono",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Rekono is an automation platform that combines different hacking tools to complete pentesting processes",
   "author": "Pablo Santiago López <rekono.project@gmail.com>",
   "homepage": "https://github.com/pablosnt/rekono",

diff --git a/rekono/rekono/settings.py b/rekono/rekono/settings.py
@@ -38,7 +38,7 @@
 
 # Rekono description
 DESCRIPTION = 'Rekono is an automation platform that combines different hacking tools to complete pentesting processes'
-VERSION = '1.5.0'                                                               # Rekono version
+VERSION = '1.5.1'                                                               # Rekono version
 TESTING = 'test' in sys.argv                                                    # Tests execution
 
 ################################################################################