From dfd8a9d1c5aa675d3ec9e6b2d1b321e73388260e Mon Sep 17 00:00:00 2001 From: prdai Date: Wed, 20 May 2026 15:01:08 +0530 Subject: [PATCH 1/2] #63 Standardize service names in Docker Compose for consistency Rename docker-compose services and container_names to use the "-server" naming convention, and update all referencing scripts, configs, and docs. Service / container renames in services/docker-compose.yaml: - smtp-server (smtp-server-container) -> postfix-server - raven container raven -> raven-server - redis (rspamd-redis) -> redis-server - unbound (rspamd-unbound) -> unbound-server - thunder -> thunder-server - metadata-service -> metadata-server - loki -> loki-server - promtail -> promtail-server - prometheus -> prometheus-server - grafana (grafana-local) -> grafana-server - cadvisor -> cadvisor-server Updated references: - depends_on chains in docker-compose.yaml - dev/examples/docker-compose.override.yml - scripts/user/{create_test_users,remove_test_users,manage_roles}.sh - services/config-scripts/gen-postfix-conf.sh (raven -> raven-server hostname) - services/metadata-service/README.md --- dev/examples/docker-compose.override.yml | 2 +- scripts/user/create_test_users.sh | 4 +- scripts/user/manage_roles.sh | 2 +- scripts/user/remove_test_users.sh | 4 +- services/config-scripts/gen-postfix-conf.sh | 16 +++---- services/docker-compose.yaml | 48 ++++++++++----------- services/metadata-service/README.md | 8 ++-- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dev/examples/docker-compose.override.yml b/dev/examples/docker-compose.override.yml index 1f7d161e..8661f733 100644 --- a/dev/examples/docker-compose.override.yml +++ b/dev/examples/docker-compose.override.yml @@ -6,7 +6,7 @@ # Note: This file is in git, but services/docker-compose.override.yml is gitignored services: - smtp-server: + postfix-server: build: context: . dockerfile: ./smtp/Dockerfile diff --git a/scripts/user/create_test_users.sh b/scripts/user/create_test_users.sh index 1909710f..329cff51 100755 --- a/scripts/user/create_test_users.sh +++ b/scripts/user/create_test_users.sh @@ -84,7 +84,7 @@ get_domain_from_config() { check_services() { echo -e "${YELLOW}Checking Docker Compose services...${NC}" - if ! (cd "${SERVICES_DIR}" && docker compose ps smtp-server) | grep -q "Up\|running"; then + if ! (cd "${SERVICES_DIR}" && docker compose ps postfix-server) | grep -q "Up\|running"; then echo -e "${RED}✗ SMTP server container is not running${NC}" echo -e "${YELLOW}Starting services with: docker compose up -d${NC}" (cd "${SERVICES_DIR}" && docker compose up -d) @@ -199,7 +199,7 @@ fi check_services # Find the smtp container -SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q smtp-server 2>/dev/null) +SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" echo -e "${YELLOW}Try running: docker compose up -d${NC}" diff --git a/scripts/user/manage_roles.sh b/scripts/user/manage_roles.sh index 93068343..d72a4c38 100755 --- a/scripts/user/manage_roles.sh +++ b/scripts/user/manage_roles.sh @@ -61,7 +61,7 @@ show_usage() { # Get SMTP container get_smtp_container() { - SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q smtp-server 2>/dev/null) + SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" exit 1 diff --git a/scripts/user/remove_test_users.sh b/scripts/user/remove_test_users.sh index 92ed7dc8..22e47806 100644 --- a/scripts/user/remove_test_users.sh +++ b/scripts/user/remove_test_users.sh @@ -68,7 +68,7 @@ get_domain_from_config() { check_services() { echo -e "${YELLOW}Checking Docker Compose services...${NC}" - if ! (cd "${SERVICES_DIR}" && docker compose ps smtp-server) | grep -q "Up\|running"; then + if ! (cd "${SERVICES_DIR}" && docker compose ps postfix-server) | grep -q "Up\|running"; then echo -e "${RED}✗ SMTP server container is not running${NC}" echo -e "${YELLOW}Please start the services first: docker compose up -d${NC}" exit 1 @@ -124,7 +124,7 @@ fi check_services # Find the smtp container -SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q smtp-server 2>/dev/null) +SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" exit 1 diff --git a/services/config-scripts/gen-postfix-conf.sh b/services/config-scripts/gen-postfix-conf.sh index f97b470f..05053ed7 100755 --- a/services/config-scripts/gen-postfix-conf.sh +++ b/services/config-scripts/gen-postfix-conf.sh @@ -28,9 +28,9 @@ mkdir -p ${CONFIGS_PATH} # - Virtual aliases: resolves email aliases to destination addresses echo -e "SMTP configuration will use:" -echo " - Socketmap for domains: raven:9100" -echo " - Socketmap for users: raven:9100" -echo " - Socketmap for aliases: raven:9100" +echo " - Socketmap for domains: raven-server:9100" +echo " - Socketmap for users: raven-server:9100" +echo " - Socketmap for aliases: raven-server:9100" # --- Generate main.cf content --- cat >"${CONFIGS_PATH}/main.cf" < Date: Fri, 22 May 2026 11:01:15 +0530 Subject: [PATCH 2/2] #63 Drop -server suffix from service names per review feedback Rename docker-compose services and all cross-references to follow the naming convention proposed in PR review: drop the -server suffix from internal services and rename metadata-server to silver-metadata. - postfix-server -> postfix - raven-server -> raven - opendkim-server -> opendkim - rspamd-server -> rspamd - redis-server -> redis - unbound-server -> unbound - clamav-server -> clamav - thunder-server -> thunder - certbot-server -> certbot - metadata-server -> silver-metadata - cadvisor-server -> cadvisor - loki-server -> loki - promtail-server -> promtail - prometheus-server -> prometheus - grafana-server -> grafana Updates docker-compose.yaml, override example, user/utility scripts, config generators, and metadata-service README to use the new names. --- dev/examples/docker-compose.override.yml | 6 +- scripts/user/create_test_users.sh | 8 +- scripts/user/manage_roles.sh | 2 +- scripts/user/remove_test_users.sh | 4 +- .../generate-rspamd-worker-controller.sh | 6 +- scripts/utils/get-dkim.sh | 2 +- services/config-scripts/gen-postfix-conf.sh | 20 ++--- services/config-scripts/gen-raven-conf.sh | 2 +- services/docker-compose.yaml | 84 +++++++++---------- services/metadata-service/README.md | 8 +- services/smtp/scripts/entrypoint.sh | 2 +- 11 files changed, 72 insertions(+), 72 deletions(-) diff --git a/dev/examples/docker-compose.override.yml b/dev/examples/docker-compose.override.yml index 8661f733..6cee25d3 100644 --- a/dev/examples/docker-compose.override.yml +++ b/dev/examples/docker-compose.override.yml @@ -6,21 +6,21 @@ # Note: This file is in git, but services/docker-compose.override.yml is gitignored services: - postfix-server: + postfix: build: context: . dockerfile: ./smtp/Dockerfile image: silver-smtp:local # Uncomment if you're also developing the DKIM server - # opendkim-server: + # opendkim: # build: # context: . # dockerfile: ./dkim/Dockerfile # image: silver-dkim:local # Uncomment if you're also developing the Certbot server - # certbot-server: + # certbot: # build: # context: ./certbot # dockerfile: ./Dockerfile diff --git a/scripts/user/create_test_users.sh b/scripts/user/create_test_users.sh index 329cff51..099ca65a 100755 --- a/scripts/user/create_test_users.sh +++ b/scripts/user/create_test_users.sh @@ -84,7 +84,7 @@ get_domain_from_config() { check_services() { echo -e "${YELLOW}Checking Docker Compose services...${NC}" - if ! (cd "${SERVICES_DIR}" && docker compose ps postfix-server) | grep -q "Up\|running"; then + if ! (cd "${SERVICES_DIR}" && docker compose ps postfix) | grep -q "Up\|running"; then echo -e "${RED}✗ SMTP server container is not running${NC}" echo -e "${YELLOW}Starting services with: docker compose up -d${NC}" (cd "${SERVICES_DIR}" && docker compose up -d) @@ -199,7 +199,7 @@ fi check_services # Find the smtp container -SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) +SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" echo -e "${YELLOW}Try running: docker compose up -d${NC}" @@ -210,13 +210,13 @@ fi docker exec "$SMTP_CONTAINER" bash -c " if [ ! -f /app/data/databases/shared.db ]; then echo 'Error: Database does not exist at /app/data/databases/shared.db' - echo 'Please ensure raven-server is running and has created the database' + echo 'Please ensure raven is running and has created the database' exit 1 fi " if [ $? -ne 0 ]; then - echo -e "${RED}✗ SQLite database not found. Please start raven-server first.${NC}" + echo -e "${RED}✗ SQLite database not found. Please start raven first.${NC}" exit 1 fi diff --git a/scripts/user/manage_roles.sh b/scripts/user/manage_roles.sh index d72a4c38..9122dc86 100755 --- a/scripts/user/manage_roles.sh +++ b/scripts/user/manage_roles.sh @@ -61,7 +61,7 @@ show_usage() { # Get SMTP container get_smtp_container() { - SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) + SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" exit 1 diff --git a/scripts/user/remove_test_users.sh b/scripts/user/remove_test_users.sh index 22e47806..c9d5cb62 100644 --- a/scripts/user/remove_test_users.sh +++ b/scripts/user/remove_test_users.sh @@ -68,7 +68,7 @@ get_domain_from_config() { check_services() { echo -e "${YELLOW}Checking Docker Compose services...${NC}" - if ! (cd "${SERVICES_DIR}" && docker compose ps postfix-server) | grep -q "Up\|running"; then + if ! (cd "${SERVICES_DIR}" && docker compose ps postfix) | grep -q "Up\|running"; then echo -e "${RED}✗ SMTP server container is not running${NC}" echo -e "${YELLOW}Please start the services first: docker compose up -d${NC}" exit 1 @@ -124,7 +124,7 @@ fi check_services # Find the smtp container -SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix-server 2>/dev/null) +SMTP_CONTAINER=$(cd "${SERVICES_DIR}" && docker compose ps -q postfix 2>/dev/null) if [ -z "$SMTP_CONTAINER" ]; then echo -e "${RED}✗ SMTP container not found. Is Docker Compose running?${NC}" exit 1 diff --git a/scripts/utils/generate-rspamd-worker-controller.sh b/scripts/utils/generate-rspamd-worker-controller.sh index dde46ef0..252bb15f 100755 --- a/scripts/utils/generate-rspamd-worker-controller.sh +++ b/scripts/utils/generate-rspamd-worker-controller.sh @@ -26,10 +26,10 @@ fi # Generate hashed password echo "Generating Rspamd password hash..." -HASH=$(docker exec rspamd-server rspamadm pw --password "$RSPAMD_PASSWORD" 2>/dev/null) +HASH=$(docker exec rspamd rspamadm pw --password "$RSPAMD_PASSWORD" 2>/dev/null) if [ -z "$HASH" ]; then - echo "Error: Could not generate password hash. Is rspamd-server running?" + echo "Error: Could not generate password hash. Is rspamd running?" exit 1 fi @@ -66,7 +66,7 @@ echo " - Password: (see .env file for RSPAMD_PASSWORD)" # Restart Rspamd container echo "" echo "Restarting Rspamd..." -(cd "$SERVICES_DIR" && docker compose restart rspamd-server) +(cd "$SERVICES_DIR" && docker compose restart rspamd) echo "" echo "✓ Done! You can now access the Rspamd web UI with your password." diff --git a/scripts/utils/get-dkim.sh b/scripts/utils/get-dkim.sh index b74650aa..652d4050 100755 --- a/scripts/utils/get-dkim.sh +++ b/scripts/utils/get-dkim.sh @@ -11,7 +11,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" CONF_DIR="$(cd "${SCRIPT_DIR}/../../conf" && pwd)" CONFIG_FILE="${CONF_DIR}/silver.yaml" -CONTAINER_NAME="opendkim-server" +CONTAINER_NAME="opendkim" # Check if container is running if ! docker ps | grep -q "$CONTAINER_NAME"; then diff --git a/services/config-scripts/gen-postfix-conf.sh b/services/config-scripts/gen-postfix-conf.sh index 05053ed7..c79c7a97 100755 --- a/services/config-scripts/gen-postfix-conf.sh +++ b/services/config-scripts/gen-postfix-conf.sh @@ -28,9 +28,9 @@ mkdir -p ${CONFIGS_PATH} # - Virtual aliases: resolves email aliases to destination addresses echo -e "SMTP configuration will use:" -echo " - Socketmap for domains: raven-server:9100" -echo " - Socketmap for users: raven-server:9100" -echo " - Socketmap for aliases: raven-server:9100" +echo " - Socketmap for domains: raven:9100" +echo " - Socketmap for users: raven:9100" +echo " - Socketmap for aliases: raven:9100" # --- Generate main.cf content --- cat >"${CONFIGS_PATH}/main.cf" <"$OUTPUT_FILE" <