Simplification

Author: YuryHrytsuk

services/rabbit/Makefile

@@ -60,7 +60,7 @@ ${CLEAN_VOLUMES_TEMP_COMPOSE}: docker-compose.clean-volumes.yaml .env
 
 TIMEOUT = 2m
 delete-volumes: ${CLEAN_VOLUMES_TEMP_COMPOSE}
-	## avoid accumulating tasks (in case they fail). Always start fresh new
+	## avoid accumulating tasks https://github.com/moby/moby/issues/45443
 	@docker stack rm --detach=false ${CLEAN_VOLUMES_STACK_NAME}
 	## use --detach=false to wait until all jobs complete successfully
 	@timeout ${TIMEOUT} \

services/rabbit/docker-compose.clean-volumes.yaml.j2

@@ -31,7 +31,7 @@ services:
         target: /app/delete_rabbit_docker_volume_on_node.sh
         mode: 0755
     environment:
-      VOLUME: ${STACK_NAME}0{{ ix }}_data
+      VOLUME: rabbit0{{ ix }}_data
       TIMEOUT_MINUTES: 1
       INTERVAL_SECONDS: 10
     entrypoint: ["/app/delete_rabbit_docker_volume_on_node.sh"]
@@ -40,4 +40,4 @@ services:
 configs:
   delete_rabbit_docker_volume_on_node_script:
     file: ./scripts/delete_rabbit_docker_volume_on_node.sh
-    name: ${STACK_NAME}_delete_rabbit_docker_volume_on_node_script_{{ "./scripts/delete_rabbit_docker_volume_on_node.sh" | sha256file | substring(0,10) }}
+    name: rabbit_delete_rabbit_docker_volume_on_node_script_{{ "./scripts/delete_rabbit_docker_volume_on_node.sh" | sha256file | substring(0,10) }}

services/rabbit/docker-compose.yml.j2

@@ -128,7 +128,7 @@ services:
 volumes:
 {% for ix in NODE_IXS %}
   rabbit0{{ ix }}_data:
-    name: ${STACK_NAME}0{{ ix }}_data
+    name: rabbit0{{ ix }}_data
 {%- endfor %}
 
 networks:
@@ -142,10 +142,10 @@ configs:
     file: ./rabbitmq.conf
   haproxy.cfg:
     file: ./haproxy.cfg
-    name: ${STACK_NAME}_haproxy_conf_{{ "./haproxy.cfg" | sha256file | substring(0,10) }}
+    name: rabbit_haproxy_conf_{{ "./haproxy.cfg" | sha256file | substring(0,10) }}
 
 secrets:
   rabbit_erlang_cookie:
     # no rolling update since it requires full cluster restart
-    name: ${STACK_NAME}_erlang_cookie
+    name: rabbit_erlang_cookie
     file: ./erlang.cookie.secret

services/rabbit/template.env

@@ -1,5 +1,3 @@
-STACK_NAME=${STACK_NAME}
-
 RABBIT_CLUSTER_NODE_COUNT=${RABBIT_CLUSTER_NODE_COUNT}
 RABBIT_QUORUM_QUEUE_DEFAULT_REPLICA_COUNT=${RABBIT_QUORUM_QUEUE_DEFAULT_REPLICA_COUNT}