From d4dc69d525fd9e5df46180f05a5a2f034f10e098 Mon Sep 17 00:00:00 2001
From: Sergei Korolev <knopki@duck.com>
Date: Sun, 2 Jul 2023 11:56:48 +0300
Subject: [PATCH] build(compose): dynamic container names

---
 .docker/common.yml                      | 6 ------
 .docker/s6-rc.d/yascheduler-add-node/up | 2 +-
 compose.yml                             | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.docker/common.yml b/.docker/common.yml
index aeba3a9..6ac7a50 100644
--- a/.docker/common.yml
+++ b/.docker/common.yml
@@ -2,7 +2,6 @@
 version: "3.9"
 services:
   db:
-    container_name: metis-db
     image: docker.io/library/postgres:14
     environment:
       POSTGRES_USER: &dbuser metis
@@ -18,7 +17,6 @@ services:
       retries: 10
 
   rabbitmq:
-    container_name: metis-rmq
     image: docker.io/library/rabbitmq:3.8.14-management
     environment:
       RABBITMQ_DEFAULT_USER: &rabbituser guest
@@ -32,7 +30,6 @@ services:
       retries: 5
 
   metis-backend:
-    container_name: metis-backend
     environment:
       PGDATABASE: *dbname
       PGHOST: db
@@ -67,7 +64,6 @@ services:
       retries: 10
 
   metis-bff:
-    container_name: metis-bff
     depends_on:
       db:
         condition: service_healthy
@@ -87,7 +83,6 @@ services:
       - "3000:3000"
 
   metis-gui:
-    container_name: metis-gui
     environment:
       PORT: "8080"
       FORCE_HTTPS: "0"
@@ -102,7 +97,6 @@ services:
 
   yanode:
     image: docker.io/linuxserver/openssh-server:latest
-    container_name: yanode
     environment:
       - PUID=1000
       - PGID=1000
diff --git a/.docker/s6-rc.d/yascheduler-add-node/up b/.docker/s6-rc.d/yascheduler-add-node/up
index becbd91..831eedc 100755
--- a/.docker/s6-rc.d/yascheduler-add-node/up
+++ b/.docker/s6-rc.d/yascheduler-add-node/up
@@ -6,4 +6,4 @@ if { s6-test -v YASCHEDULER_ADD_NODE_HOST }
 importas HOST YASCHEDULER_ADD_NODE_HOST
 importas -D "root" USERNAME YASCHEDULER_ADD_NODE_USER
 foreground { echo Adding node $HOST }
-wait-for-it ${HOST}:22 --timeout=60 --strict -- bash -c "yasetnode ${USERNAME}@$( getent hosts $HOST | awk '{ print $1 }' )"
+wait-for-it ${HOST}:22 --timeout=60 --strict -- bash -c "yasetnode ${USERNAME}@$( getent ahosts $HOST | awk '{ print $1 }' | head -n 1 )"
diff --git a/compose.yml b/compose.yml
index bd986ec..85dc350 100644
--- a/compose.yml
+++ b/compose.yml
@@ -9,7 +9,6 @@ services:
       - ./.docker/db/pgcrypto.sql:/docker-entrypoint-initdb.d/10-pgcrypto.sql
 
   adminer:
-    container_name: metis-adminer
     depends_on: ["db"]
     image: docker.io/library/adminer:4
     ports: