From 6e6fe8c5fb03b37476dc6e88edba0bc620226a18 Mon Sep 17 00:00:00 2001 From: trpyn Date: Tue, 15 Sep 2026 05:33:26 +0200 Subject: [PATCH 1/4] Replace minio with rustfs after minio deprecation --- .envs/.local/.django | 5 ++--- config/settings/base.py | 6 +++--- config/settings/local.py | 4 ++-- local.yml | 15 +++++++-------- production.yml | 15 +++++++-------- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.envs/.local/.django b/.envs/.local/.django index e68802cd..fa6e8a24 100644 --- a/.envs/.local/.django +++ b/.envs/.local/.django @@ -5,10 +5,9 @@ IPYTHONDIR=/app/.ipython REDIS_URL=redis://redis:6379/0 -MINIO_ROOT_USER=KBP6WXGPS387090EZMG8 -MINIO_ROOT_PASSWORD=DRjFXylyfMqn2zilAr33xORhaYz5r9e8r37XPz3A +RUSTFS_ACCESS_KEY=KBP6WXGPS387090EZMG8 +RUSTFS_SECRET_KEY=DRjFXylyfMqn2zilAr33xORhaYz5r9e8r37XPz3A -# VT_API_KEY= # Django Superuser Info diff --git a/config/settings/base.py b/config/settings/base.py index b3cc9bae..03980ccc 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -167,9 +167,9 @@ MEDIA_URL = "/media/" DEFAULT_FILE_STORAGE = "minio_storage.storage.MinioMediaStorage" -MINIO_STORAGE_ENDPOINT = 'minio:9000' -MINIO_STORAGE_ACCESS_KEY = env('MINIO_ROOT_USER') -MINIO_STORAGE_SECRET_KEY = env('MINIO_ROOT_PASSWORD') +MINIO_STORAGE_ENDPOINT = 'rustfs:9000' +MINIO_STORAGE_ACCESS_KEY = env('RUSTFS_ACCESS_KEY') +MINIO_STORAGE_SECRET_KEY = env('RUSTFS_SECRET_KEY') MINIO_STORAGE_USE_HTTPS = False MINIO_STORAGE_MEDIA_BUCKET_NAME = 'local-media' MINIO_STORAGE_AUTO_CREATE_MEDIA_BUCKET = True diff --git a/config/settings/local.py b/config/settings/local.py index f80a81d3..38feb0ff 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -1,4 +1,4 @@ -from .base import REST_FRAMEWORK +from .base import * # noqa from .base import env # GENERAL @@ -33,7 +33,7 @@ # WhiteNoise # ------------------------------------------------------------------------------ # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development -INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405 +INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # # django-debug-toolbar diff --git a/local.yml b/local.yml index 691364d1..e933667f 100644 --- a/local.yml +++ b/local.yml @@ -3,7 +3,7 @@ volumes: local_postgres_data: {} local_postgres_data_backups: {} local_elasticsearch_data: {} - local_minio_data: {} + local_rustfs_data: {} local_prometheus_data: {} local_grafana_data: {} @@ -18,7 +18,7 @@ services: condition: service_started redis: condition: service_started - minio: + rustfs: condition: service_started mobsf: condition: service_started @@ -45,7 +45,7 @@ services: condition: service_started redis: condition: service_started - minio: + rustfs: condition: service_started elasticsearch: condition: service_healthy @@ -119,15 +119,14 @@ services: env_file: - ./.envs/.local/.elastic - minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + rustfs: + image: rustfs/rustfs:latest volumes: - - local_minio_data:/data + - local_rustfs_data:/data env_file: - ./.envs/.local/.django - command: server /data healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] + test: ["CMD", "curl", "-f", "http://localhost:9000/health/ready"] interval: 30s timeout: 20s retries: 3 diff --git a/production.yml b/production.yml index 96527dce..3b12ac72 100644 --- a/production.yml +++ b/production.yml @@ -5,7 +5,7 @@ volumes: production_traefik: {} production_traefik_logs: {} production_elasticsearch_data: {} - production_minio_data: {} + production_rustfs_data: {} production_prometheus_data: {} production_grafana_data: {} @@ -20,7 +20,7 @@ services: condition: service_started redis: condition: service_started - minio: + rustfs: condition: service_started mobsf: condition: service_started @@ -40,7 +40,7 @@ services: condition: service_started postgres: condition: service_started - minio: + rustfs: condition: service_started elasticsearch: condition: service_healthy @@ -110,15 +110,14 @@ services: - "MOBSF_NIAP_ENABLED=1" - "MOBSF_CVSS_SCORE_ENABLED=1" - minio: - image: minio/minio:RELEASE.2025-09-07T16-13-09Z + rustfs: + image: rustfs/rustfs:latest volumes: - - production_minio_data:/data + - production_rustfs_data:/data env_file: - ./.envs/.production/.django - command: server /data healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] + test: ["CMD", "curl", "-f", "http://localhost:9000/health/ready"] interval: 30s timeout: 20s retries: 3 From 7475b5fe4d99e00f551806f7b421d71aa2fca67a Mon Sep 17 00:00:00 2001 From: trpyn Date: Tue, 15 Sep 2026 05:37:27 +0200 Subject: [PATCH 2/4] update mobsf version to v4.5.2 --- local.yml | 2 +- production.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/local.yml b/local.yml index e933667f..30c6612f 100644 --- a/local.yml +++ b/local.yml @@ -97,7 +97,7 @@ services: start_period: 20s mobsf: - image: opensecurity/mobile-security-framework-mobsf:v4.4.6 + image: opensecurity/mobile-security-framework-mobsf:v4.5.2 hostname: mobsf ports: - 8181:8000 diff --git a/production.yml b/production.yml index 3b12ac72..edc41167 100644 --- a/production.yml +++ b/production.yml @@ -102,7 +102,7 @@ services: mobsf: - image: opensecurity/mobile-security-framework-mobsf:v4.4.6 + image: opensecurity/mobile-security-framework-mobsf:v4.5.2 hostname: mobsf environment: - "MOBSF_API_ONLY=1" From 03385ff61d58385e747d86d028ff4f72971c1f9a Mon Sep 17 00:00:00 2001 From: trpyn Date: Tue, 15 Sep 2026 05:41:14 +0200 Subject: [PATCH 3/4] flake8 --- config/settings/local.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/settings/local.py b/config/settings/local.py index 38feb0ff..7025efc8 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -1,4 +1,4 @@ -from .base import * # noqa +from .base import * from .base import env # GENERAL @@ -33,7 +33,7 @@ # WhiteNoise # ------------------------------------------------------------------------------ # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development -INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS +INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405 # # django-debug-toolbar @@ -62,4 +62,4 @@ # Your stuff... # ------------------------------------------------------------------------------ -REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]['user'] = '100/minute' +REST_FRAMEWORK["DEFAULT_THROTTLE_RATES"]['user'] = '100/minute' # noqa F405 From 334ed46162072257137f2b2b247385fbcc2dffda Mon Sep 17 00:00:00 2001 From: trpyn Date: Tue, 15 Sep 2026 05:42:29 +0200 Subject: [PATCH 4/4] =?UTF-8?q?flake8=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/settings/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/settings/local.py b/config/settings/local.py index 7025efc8..4edf2ef9 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -1,4 +1,4 @@ -from .base import * +from .base import * # noqa from .base import env # GENERAL