Merge pull request #29 from mpast/dev

Upgraded docker images and dependencies
mpast · Apr 14, 2021 · 8bc6d93 · 8bc6d93
2 parents bf2dad1 + 833e406
commit 8bc6d93
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.2-buster@sha256:d66a49bd2e3fd942969fa10fd4179076d1fddf78c521e272059ca965a0231e9c
+FROM python:3.9.4-buster@sha256:79a631c93960c5919f27f3403e734ec19b130008370a5f902141bcff2e6d6f4c
 # Update and package installation
 RUN apt-get update && \
 	apt-get clean && \

diff --git a/README.md b/README.md
@@ -31,8 +31,8 @@ Django Web application for performing Static Analysis and detecting malware in A
 ![Schema](app/static/schema.png)
 
 - **db**: PostgreSQL 13.2
-- **nginx**: Nginx 1.19.7
-- **rabbitmq**: RabbitMQ 3.8.12
+- **nginx**: Nginx 1.19.10
+- **rabbitmq**: RabbitMQ 3.8.14
 - **worker**: Celery 5.0.5
 - **web**: Mobile Audit App
 
@@ -42,6 +42,7 @@ Image is based on python buster. Link to [Docker Hub image](https://hub.docker.c
 
 | Image |  Tags | Base |
 |--------------------|-------|---------------------|
+| mpast/mobile_audit | 1.3.8 | python:3.9.4-buster |
 | mpast/mobile_audit | 1.3.6 | python:3.9.2-buster |
 | mpast/mobile_audit | 1.3.0 | python:3.9.1-buster |
 | mpast/mobile_audit | 1.0.0 | python:3.9.0-buster |
@@ -58,7 +59,7 @@ Image is based on python buster. Link to [Docker Hub image](https://hub.docker.c
 - [x] User authentication and user management
 - [x] API v1 with Swagger and ReDoc
 - [x] TLS
-- [ ] Dynamic page reload
+- [x] Dynamic page reload (WIP)
 - [ ] LDAP integration
 - [ ] Export to Markdown
 - [ ] Export to CSV

diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
@@ -28,7 +28,7 @@ services:
       - db
     restart: on-failure
   nginx:
-    image: nginx:1.19.7@sha256:f3693fe50d5b1df1ecd315d54813a77afd56b0245a404055a946574deb6b34fc
+    image: nginx:1.19.10@sha256:75a55d33ecc73c2a242450a9f1cc858499d468f077ea942867e662c247b5e412
     ports:
       - "443:443"
     volumes:
@@ -39,7 +39,7 @@ services:
       - web
     restart: on-failure
   rabbitmq:
-    image: rabbitmq:3.8.12-management@sha256:9d340b284990eb7f465616504f3fb058948ce58065997aa54d802aab0e8e60c2
+    image: rabbitmq:3.8.14-management-alpine@sha256:7248e0d63eb59364b1b8e0456580450ff8061f9365d344ab211a4ce7b544886f
     env_file:
       - ./.env.example
     environment:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -28,7 +28,7 @@ services:
       - db
     restart: on-failure
   nginx:
-    image: nginx:1.19.7@sha256:f3693fe50d5b1df1ecd315d54813a77afd56b0245a404055a946574deb6b34fc
+    image: nginx:1.19.10@sha256:75a55d33ecc73c2a242450a9f1cc858499d468f077ea942867e662c247b5e412
     ports:
       - "8888:8888"
     volumes:
@@ -38,7 +38,7 @@ services:
       - web
     restart: on-failure
   rabbitmq:
-    image: rabbitmq:3.8.12-management@sha256:9d340b284990eb7f465616504f3fb058948ce58065997aa54d802aab0e8e60c2
+    image: rabbitmq:3.8.14-management-alpine@sha256:7248e0d63eb59364b1b8e0456580450ff8061f9365d344ab211a4ce7b544886f
     env_file:
       - ./.env.example
     environment:

diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,16 @@
-django==3.1.8
+django==3.2
 psycopg2-binary==2.8.6
-django-bootstrap4==2.3.1
+django-bootstrap4==3.0.0
 django-widget-tweaks==1.4.8
 django-fontawesome-5==1.0.18
 django-getenv==1.3.2
 androguard==3.4.0a1
 requests==2.25.1
 pdfkit==0.6.1
 uwsgi==2.0.19.1
-Pygments==2.8.0
-djangorestframework==3.12.2
+Pygments==2.8.1
+djangorestframework==3.12.4
 drf-yasg==1.20.0
 Celery==5.0.5
 django-filter==2.4.0
-sqlalchemy==1.3.23
+sqlalchemy==1.4.7