From c7ab9914d35a41604e77c2b76215e25f5c4a0231 Mon Sep 17 00:00:00 2001
From: Grigory Efimov <grigory.efimov@gmail.com>
Date: Thu, 27 Jun 2024 18:56:04 -0300
Subject: [PATCH 1/2] Dockerfile-generateconfig-* refactoring ENTRYPOINT

---
 Dockerfile-generateconfig-anyconf    | 2 +-
 Dockerfile-generateconfig-env        | 2 +-
 Dockerfile-generateconfig-processing | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile-generateconfig-anyconf b/Dockerfile-generateconfig-anyconf
index c857174..41ce00a 100644
--- a/Dockerfile-generateconfig-anyconf
+++ b/Dockerfile-generateconfig-anyconf
@@ -9,4 +9,4 @@ HEALTHCHECK \
     --interval=10s \
     --timeout=3s \
     CMD echo 'HEALTHCHECK' | nc 127.0.0.1 8000 | grep -q HEALTHCHECK
-ENTRYPOINT ./docker-generateconfig/anyconf.sh
+ENTRYPOINT ["/code/docker-generateconfig/anyconf.sh"]
diff --git a/Dockerfile-generateconfig-env b/Dockerfile-generateconfig-env
index 2ad7233..4c4d3c8 100644
--- a/Dockerfile-generateconfig-env
+++ b/Dockerfile-generateconfig-env
@@ -3,4 +3,4 @@ FROM python:3.11-alpine
 WORKDIR /code
 COPY docker-generateconfig/env-requirements.txt requirements.txt
 RUN pip install -r requirements.txt
-ENTRYPOINT ./docker-generateconfig/env.py
+ENTRYPOINT ["/code/docker-generateconfig/env.py"]
diff --git a/Dockerfile-generateconfig-processing b/Dockerfile-generateconfig-processing
index 9e9e57d..34b88b7 100644
--- a/Dockerfile-generateconfig-processing
+++ b/Dockerfile-generateconfig-processing
@@ -8,4 +8,4 @@ HEALTHCHECK \
     --interval=5s \
     --timeout=3s \
     CMD echo 'HEALTHCHECK' | nc 127.0.0.1 8000 | grep -q HEALTHCHECK
-ENTRYPOINT ./docker-generateconfig/processing.sh
+ENTRYPOINT ["/code/docker-generateconfig/processing.sh"]

From ab3dcd93cca58c157d62db54f9f8c5682dbc8c7b Mon Sep 17 00:00:00 2001
From: Grigory Efimov <grigory.efimov@gmail.com>
Date: Thu, 27 Jun 2024 20:09:43 -0300
Subject: [PATCH 2/2] docker-compose.yml added "stop_signal" and refactoring
 "command"

---
 docker-compose.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 383c946..e404388 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-generateconfig-anyconf
+    stop_signal: SIGKILL
     volumes:
       - ./:/code
       - "${STORAGE_DIR}:/code/storage"
@@ -16,6 +17,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-generateconfig-processing
+    stop_signal: SIGKILL
     volumes:
       - ./:/code
       - "${STORAGE_DIR}:/code/storage"
@@ -25,7 +27,7 @@ services:
       generateconfig-processing:
         condition: service_healthy
     image: "mongo:${MONGO_VERSION}"
-    command: --replSet ${MONGO_REPLICA_SET} --port ${MONGO_1_PORT}
+    command: ["--replSet", "${MONGO_REPLICA_SET}", "--port", "${MONGO_1_PORT}"]
     ports:
       - "${MONGO_1_PORT}:${MONGO_1_PORT}"
     volumes:
@@ -41,7 +43,7 @@ services:
         condition: service_healthy
     image: "redis/redis-stack-server:${REDIS_VERSION}"
     restart: always
-    command: redis-server --port ${REDIS_PORT} --dir /data/ --appendonly yes --maxmemory 256mb --maxmemory-policy noeviction --protected-mode no --loadmodule /opt/redis-stack/lib/redisbloom.so
+    command: ["redis-server", "--port", "${REDIS_PORT}", "--dir", "/data/", "--appendonly", "yes", "--maxmemory", "256mb", "--maxmemory-policy", "noeviction", "--protected-mode", "no", "--loadmodule", "/opt/redis-stack/lib/redisbloom.so"]
     ports:
       - "${REDIS_PORT}:${REDIS_PORT}"
     volumes:
@@ -55,7 +57,7 @@ services:
   minio:
     image: "minio/minio:${MINIO_VERSION}"
     restart: always
-    command: server /data --console-address ":${MINIO_WEB_PORT}" --address ":${MINIO_PORT}"
+    command: ["server", "/data", "--console-address", ":${MINIO_WEB_PORT}", "--address", ":${MINIO_PORT}"]
     environment:
       MINIO_ROOT_USER: "${AWS_ACCESS_KEY_ID}"
       MINIO_ROOT_PASSWORD: "${AWS_SECRET_ACCESS_KEY}"
@@ -81,10 +83,7 @@ services:
     restart: "no"
     depends_on:
       - minio
-    entrypoint:
-      - sh
-      - -c
-      - mc mb minio/${MINIO_BUCKET}
+    command: [ "mc", "mb", "minio/${MINIO_BUCKET}"]
 
   any-sync-coordinator_bootstrap:
     image: "ghcr.io/anyproto/any-sync-coordinator:${ANY_SYNC_COORDINATOR_VERSION}"
@@ -96,7 +95,7 @@ services:
     volumes:
       - ./etc/any-sync-coordinator/:/etc/any-sync-coordinator/
     restart: "no"
-    command: bash -c "/bin/any-sync-confapply -c /etc/any-sync-coordinator/config.yml -n /etc/any-sync-coordinator/network.yml -e"
+    command: ["/bin/any-sync-confapply", "-c", "/etc/any-sync-coordinator/config.yml", "-n", "/etc/any-sync-coordinator/network.yml", "-e"]
 
   any-sync-coordinator:
     image: "ghcr.io/anyproto/any-sync-coordinator:${ANY_SYNC_COORDINATOR_VERSION}"
@@ -234,7 +233,8 @@ services:
     volumes:
       - ./:/code
       - "${STORAGE_DIR}:/code/storage"
-    command: "tail -f /dev/null"
+    command: ["tail", "-f", "/dev/null"]
+    stop_signal: SIGKILL
     tty: true
     healthcheck:
       test: any-sync-netcheck -c /code/storage/docker-generateconfig/nodes.yml 2>&1| grep -P 'netcheck\s+success'