From 3464612493646491bee742b4951c334ff76be080 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Thu, 19 Nov 2026 17:34:40 +0530 Subject: [PATCH 1/3] chore: pin nginx and redis docker images Signed-off-by: Keshav Priyadarshi --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 45ee678cf..1b4b899dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +name: vulnerablecode services: db: @@ -12,7 +12,7 @@ services: shm_size: 1gb vulnerablecode_redis: - image: redis + image: docker.io/library/redis:8.10.3-alpine volumes: - vulnerablecode_redis_data:/data restart: always @@ -70,7 +70,7 @@ services: - vulnerablecode nginx: - image: nginx + image: docker.io/library/nginx:1.31.9-alpine ports: - 80:80 - 443:443 From 0c6c10db7d465ac126fa90c7f8d6eb8dcfc81f01 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Thu, 19 Nov 2026 18:40:53 +0530 Subject: [PATCH 2/3] chore: reuse single build across common services Signed-off-by: Keshav Priyadarshi --- docker-compose.yml | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1b4b899dc..0e174cf1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,16 @@ name: vulnerablecode +x-app-volume: &app-volume /etc/vulnerablecode/:/etc/vulnerablecode/ + +x-app-common: &app-common + build: + context: . + dockerfile: Dockerfile + env_file: + - docker.env + volumes: + - *app-volume + services: db: image: postgres:15 @@ -18,56 +29,42 @@ services: restart: always vulnerablecode: - build: . + <<: *app-common command: /bin/sh -c " ./manage.py migrate && ./manage.py collectstatic --no-input --verbosity 0 --clear && gunicorn vulnerablecode.wsgi:application -u nobody -g nogroup --bind :8000 --timeout 600 --workers 8" - env_file: - - docker.env expose: - 8000 volumes: - - /etc/vulnerablecode/:/etc/vulnerablecode/ + - *app-volume - static:/var/vulnerablecode/static/ depends_on: - db vulnerablecode_scheduler: - build: . + <<: *app-common command: wait-for-it web:8000 -- python ./manage.py run_scheduler - env_file: - - docker.env - volumes: - - /etc/vulnerablecode/:/etc/vulnerablecode/ depends_on: - - vulnerablecode_redis - db - vulnerablecode + - vulnerablecode_redis vulnerablecode_rqworker: - build: . + <<: *app-common command: wait-for-it web:8000 -- python ./manage.py rqworker default - env_file: - - docker.env - volumes: - - /etc/vulnerablecode/:/etc/vulnerablecode/ depends_on: - - vulnerablecode_redis - db - vulnerablecode + - vulnerablecode_redis vulnerablecode_rqworker_high: - build: . + <<: *app-common command: wait-for-it web:8000 -- python ./manage.py rqworker high - env_file: - - docker.env - volumes: - - /etc/vulnerablecode/:/etc/vulnerablecode/ depends_on: - - vulnerablecode_redis - db - vulnerablecode + - vulnerablecode_redis nginx: image: docker.io/library/nginx:1.31.9-alpine From 411a311682130645e228e7ed9e66b8d577142b79 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Thu, 19 Nov 2026 22:51:19 +0530 Subject: [PATCH 3/3] feat: add health check to vulnerablecode services Signed-off-by: Keshav Priyadarshi --- docker-compose.yml | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0e174cf1b..0b995a8dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ name: vulnerablecode x-app-volume: &app-volume /etc/vulnerablecode/:/etc/vulnerablecode/ x-app-common: &app-common + image: vulnerablecode:${VULNERABLECODE_VERSION:-latest} build: context: . dockerfile: Dockerfile @@ -21,12 +22,23 @@ services: - db_data:/var/lib/postgresql/data/ - ./etc/postgresql/postgresql.conf:/etc/postgresql/postgresql.conf shm_size: 1gb + restart: always + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"] + interval: 10s + timeout: 5s + retries: 5 vulnerablecode_redis: image: docker.io/library/redis:8.10.3-alpine volumes: - vulnerablecode_redis_data:/data restart: always + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 10s + timeout: 5s + retries: 5 vulnerablecode: <<: *app-common @@ -39,32 +51,43 @@ services: volumes: - *app-volume - static:/var/vulnerablecode/static/ + restart: always depends_on: - - db + db: + condition: service_healthy vulnerablecode_scheduler: <<: *app-common command: wait-for-it web:8000 -- python ./manage.py run_scheduler depends_on: - - db - - vulnerablecode - - vulnerablecode_redis + db: + condition: service_healthy + vulnerablecode: + condition: service_started + vulnerablecode_redis: + condition: service_healthy vulnerablecode_rqworker: <<: *app-common command: wait-for-it web:8000 -- python ./manage.py rqworker default depends_on: - - db - - vulnerablecode - - vulnerablecode_redis + db: + condition: service_healthy + vulnerablecode: + condition: service_started + vulnerablecode_redis: + condition: service_healthy vulnerablecode_rqworker_high: <<: *app-common command: wait-for-it web:8000 -- python ./manage.py rqworker high depends_on: - - db - - vulnerablecode - - vulnerablecode_redis + db: + condition: service_healthy + vulnerablecode: + condition: service_started + vulnerablecode_redis: + condition: service_healthy nginx: image: docker.io/library/nginx:1.31.9-alpine @@ -77,8 +100,10 @@ services: - ./etc/nginx/conf.d/:/etc/nginx/conf.d/ - static:/var/vulnerablecode/static/ - /var/www/html:/var/www/html + restart: always depends_on: - - vulnerablecode + vulnerablecode: + condition: service_started volumes: