Skip to content

do not build/start unused services in unit test docker compose files #13220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valentijnscholten merged 1 commit into from
Sep 23, 2025
Merged

do not build/start unused services in unit test docker compose files #13220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions docker-compose.override.unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
---
services:
nginx:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'nginx']
volumes:
- defectdojo_media_unit_tests:/usr/share/nginx/html/media
nginx: !reset
uwsgi:
build:
target: django-unittests
entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/app/docker/entrypoint-unit-tests-devDocker.sh']
volumes:
- '.:/app:z'
- "defectdojo_media_unit_tests:${DD_MEDIA_ROOT:-/app/media}"
depends_on: !override
postgres:
condition: service_started
environment:
PYTHONWARNINGS: error # We are strict about Warnings during testing
DD_DEBUG: 'True'
Expand All @@ -30,15 +29,9 @@ services:
DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite'
DD_CELERY_BROKER_PARAMS: ''
DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error
celerybeat:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'celery beat']
celeryworker:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'celery worker']
initializer:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'initializer']
celerybeat: !reset
celeryworker: !reset
initializer: !reset
postgres:
ports:
- target: ${DD_DATABASE_PORT:-5432}
Expand All @@ -49,9 +42,7 @@ services:
POSTGRES_DB: ${DD_TEST_DATABASE_NAME:-test_defectdojo}
volumes:
- defectdojo_postgres_unit_tests:/var/lib/postgresql/data
redis:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'redis']
redis: !reset
"webhook.endpoint":
image: mccutchen/go-httpbin:2.18.3@sha256:3992f3763e9ce5a4307eae0a869a78b4df3931dc8feba74ab823dd2444af6a6b
volumes:
Expand Down
25 changes: 8 additions & 17 deletions docker-compose.override.unit_tests_cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
---
services:
nginx:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'nginx']
volumes:
- defectdojo_media_unit_tests:/usr/share/nginx/html/media
nginx: !reset
uwsgi:
build:
target: django-unittests
entrypoint: ['/wait-for-it.sh', '${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432}', '-t', '30', '--', '/app/docker/entrypoint-unit-tests.sh']
volumes:
- '.:/app:z'
- "defectdojo_media_unit_tests:${DD_MEDIA_ROOT:-/app/media}"
depends_on: !override
postgres:
condition: service_started
environment:
PYTHONWARNINGS: error # We are strict about Warnings during testing
DD_DEBUG: 'True'
Expand All @@ -29,15 +28,9 @@ services:
DD_CELERY_BROKER_PATH: '/dojo.celerydb.sqlite'
DD_CELERY_BROKER_PARAMS: ''
DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error
celerybeat:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'celery beat']
celeryworker:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'celery worker']
initializer:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'initializer']
celerybeat: !reset
celeryworker: !reset
initializer: !reset
postgres:
ports:
- target: ${DD_DATABASE_PORT:-5432}
Expand All @@ -48,9 +41,7 @@ services:
POSTGRES_DB: ${DD_TEST_DATABASE_NAME:-test_defectdojo}
volumes:
- defectdojo_postgres_unit_tests:/var/lib/postgresql/data
redis:
image: busybox:1.37.0-musl@sha256:254e6134b1bf813b34e920bc4235864a54079057d51ae6db9a4f2328f261c2ad
entrypoint: ['echo', 'skipping', 'redis']
redis: !reset
"webhook.endpoint":
image: mccutchen/go-httpbin:2.18.3@sha256:3992f3763e9ce5a4307eae0a869a78b4df3931dc8feba74ab823dd2444af6a6b
volumes:
Expand Down