From 2d75a3865f19f100b711f092560261e6bc08a991 Mon Sep 17 00:00:00 2001 From: reachableceo Date: Sat, 5 Sep 2026 07:27:05 -0500 Subject: [PATCH] [#389] house naming: container_name for all 21 GVM services (ukrrs-oam-gvm-*) https://projects.knownelement.com/issues/389 --- docker/gvm-test/compose.yaml | 21 +++++++++++++++++++++ scripts/check-rules.sh | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docker/gvm-test/compose.yaml b/docker/gvm-test/compose.yaml index 3de5fcb..da481a8 100644 --- a/docker/gvm-test/compose.yaml +++ b/docker/gvm-test/compose.yaml @@ -3,6 +3,7 @@ name: greenbone-community-edition services: vulnerability-tests: image: registry.community.greenbone.net/community/vulnerability-tests + container_name: ukrrs-oam-gvm-vulnerability-tests environment: FEED_RELEASE: "24.10" KEEP_ALIVE: 1 @@ -11,6 +12,7 @@ services: notus-data: image: registry.community.greenbone.net/community/notus-data + container_name: ukrrs-oam-gvm-notus-data environment: KEEP_ALIVE: 1 volumes: @@ -18,6 +20,7 @@ services: scap-data: image: registry.community.greenbone.net/community/scap-data + container_name: ukrrs-oam-gvm-scap-data environment: KEEP_ALIVE: 1 volumes: @@ -25,6 +28,7 @@ services: cert-bund-data: image: registry.community.greenbone.net/community/cert-bund-data + container_name: ukrrs-oam-gvm-cert-bund-data environment: KEEP_ALIVE: 1 volumes: @@ -32,6 +36,7 @@ services: dfn-cert-data: image: registry.community.greenbone.net/community/dfn-cert-data + container_name: ukrrs-oam-gvm-dfn-cert-data environment: KEEP_ALIVE: 1 volumes: @@ -42,6 +47,7 @@ services: data-objects: image: registry.community.greenbone.net/community/data-objects + container_name: ukrrs-oam-gvm-data-objects environment: FEED_RELEASE: "24.10" KEEP_ALIVE: 1 @@ -50,6 +56,7 @@ services: report-formats: image: registry.community.greenbone.net/community/report-formats + container_name: ukrrs-oam-gvm-report-formats environment: FEED_RELEASE: "24.10" KEEP_ALIVE: 1 @@ -61,11 +68,13 @@ services: gpg-data: image: registry.community.greenbone.net/community/gpg-data + container_name: ukrrs-oam-gvm-gpg-data volumes: - gpg_data_vol:/mnt redis-server: image: registry.community.greenbone.net/community/redis-server + container_name: ukrrs-oam-gvm-redis-server deploy: restart_policy: condition: any @@ -74,6 +83,7 @@ services: pg-gvm: image: registry.community.greenbone.net/community/pg-gvm:stable + container_name: ukrrs-oam-gvm-pg-gvm deploy: restart_policy: condition: any @@ -86,6 +96,7 @@ services: pg-gvm-migrator: image: registry.community.greenbone.net/community/pg-gvm-migrator:stable + container_name: ukrrs-oam-gvm-pg-gvm-migrator deploy: restart_policy: condition: none @@ -95,6 +106,7 @@ services: gvmd: image: registry.community.greenbone.net/community/gvmd:stable + container_name: ukrrs-oam-gvm-gvmd deploy: restart_policy: condition: any @@ -124,6 +136,7 @@ services: gsa: image: registry.community.greenbone.net/community/gsa:stable-slim + container_name: ukrrs-oam-gvm-gsa environment: MOUNT_PATH: "/mnt/web" KEEP_ALIVE: 1 @@ -135,6 +148,7 @@ services: gsad: image: registry.community.greenbone.net/community/gsad:stable + container_name: ukrrs-oam-gvm-gsad deploy: restart_policy: condition: any @@ -150,6 +164,7 @@ services: gvm-config: image: registry.community.greenbone.net/community/gvm-config@sha256:a83d05963ad5cd15099257baf704c16323cbc9a370e25e6a016a897fbccb43c2 + container_name: ukrrs-oam-gvm-gvm-config environment: ENABLE_NGINX_CONFIG: true ENABLE_TLS_GENERATION: true @@ -159,6 +174,7 @@ services: nginx: image: registry.community.greenbone.net/community/nginx@sha256:53bfde7e5db20cef57c2b8a9ca654a08803614193c929248f43dfd8293fd34d1 + container_name: ukrrs-oam-gvm-nginx ports: - 127.0.0.1:443:443 - 127.0.0.1:9392:9392 @@ -182,6 +198,7 @@ services: # to reduce likelihood of unwanted log interferences configure-openvas: image: registry.community.greenbone.net/community/openvas-scanner:stable + container_name: ukrrs-oam-gvm-configure-openvas volumes: - openvas_data_vol:/mnt - openvas_log_data_vol:/var/log/openvas @@ -199,6 +216,7 @@ services: # shows logs of openvas openvas: image: registry.community.greenbone.net/community/openvas-scanner:stable + container_name: ukrrs-oam-gvm-openvas volumes: - openvas_data_vol:/etc/openvas - openvas_log_data_vol:/var/log/openvas @@ -214,6 +232,7 @@ services: openvasd: image: registry.community.greenbone.net/community/openvas-scanner:stable + container_name: ukrrs-oam-gvm-openvasd deploy: restart_policy: condition: any @@ -247,6 +266,7 @@ services: ospd-openvas: image: registry.community.greenbone.net/community/ospd-openvas:stable + container_name: ukrrs-oam-gvm-ospd-openvas deploy: restart_policy: condition: any @@ -290,6 +310,7 @@ services: gvm-tools: image: registry.community.greenbone.net/community/gvm-tools + container_name: ukrrs-oam-gvm-gvm-tools volumes: - gvmd_socket_vol:/run/gvmd - ospd_openvas_socket_vol:/run/ospd diff --git a/scripts/check-rules.sh b/scripts/check-rules.sh index c112383..093de16 100755 --- a/scripts/check-rules.sh +++ b/scripts/check-rules.sh @@ -87,7 +87,7 @@ if [ -n "$COMPOSE_FILES" ]; then # Count top-level service keys (2-space indent under services:) and # compare against the number of container_name: declarations. svc_count=$(awk '/^services:/{f=1;next} f&&/^[^[:space:]]/{f=0} f&&/^[[:space:]]{2}[[:alnum:]_-]+:[[:space:]]*$/{c++} END{print c+0}' "$cf") - cn_count=$(grep -cE '^[[:space:]]*container_name:' "$cf" 2>/dev/null || echo 0) + cn_count=$(grep -cE '^[[:space:]]*container_name:' "$cf" 2>/dev/null || true) if [ "${svc_count:-0}" -gt 0 ] && [ "$cn_count" -lt "$svc_count" ]; then BAD=$((BAD + 1)) fi