Merge branch 'main' of https://github.com/DSAV-Dodeka/dodeka

build/container/kv/confspawn_Dockerfile

@@ -3,4 +3,6 @@ FROM redis:7.2-bookworm
 ADD redis.conf {{ kv.redis_conf_dir }}
 # loadmodule in conf is done on startup
 COPY librejson.so /rejson/librejson.so
-CMD [ "redis-server", "{{ kv.redis_conf_dir }}" ]
+ADD command.sh /command.sh
+WORKDIR /
+CMD [ "./command.sh", "$REDIS_PASSWORD" ]

build/container/kv/confspawn_command.sh

@@ -0,0 +1,9 @@
+#/bin/sh
+
+# Check if the $HI variable is set
+if [ -n "$REDIS_PASSWORD" ]; then
+  redis-server {{ kv.redis_conf_dir }} --requirepass "$REDIS_PASSWORD"
+else
+  echo "Error: \$REDIS_PASSWORD must be set!"
+  exit 1
+fi

build/deploy/compose/confspawn_docker-compose.yml

@@ -31,9 +31,10 @@ services:
   {{ kv.service_name }}:
     profiles: [ "data", "all" ]
     image: "${KV_IMAGE}:${KV_VERSION}"
+    environment:
+      - REDIS_PASSWORD
     ports:
       - "${KV_HOST_HOST}:${KV_HOST_PORT}:{{ kv.container_port }}"
-    command: /bin/sh -c "redis-server {{ kv.redis_conf_dir }} --requirepass ${REDIS_PASSWORD}"
     restart: {{ confspawn_env.restart }}
   {{ server.service_name }}:
     profiles: [ "all" ]

use/dev/docker-compose.yml

@@ -31,9 +31,10 @@ services:
   kv:
     profiles: [ "data", "all" ]
     image: "${KV_IMAGE}:${KV_VERSION}"
+    environment:
+      - REDIS_PASSWORD
     ports:
       - "${KV_HOST_HOST}:${KV_HOST_PORT}:6379"
-    command: /bin/sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass ${REDIS_PASSWORD}"
     restart: "no"
   server:
     profiles: [ "all" ]

use/production/docker-compose.yml

@@ -31,9 +31,10 @@ services:
   kv:
     profiles: [ "data", "all" ]
     image: "${KV_IMAGE}:${KV_VERSION}"
+    environment:
+      - REDIS_PASSWORD
     ports:
       - "${KV_HOST_HOST}:${KV_HOST_PORT}:6379"
-    command: /bin/sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass ${REDIS_PASSWORD}"
     restart: always
   server:
     profiles: [ "all" ]

use/staging/docker-compose.yml

@@ -31,9 +31,10 @@ services:
   kv:
     profiles: [ "data", "all" ]
     image: "${KV_IMAGE}:${KV_VERSION}"
+    environment:
+      - REDIS_PASSWORD
     ports:
       - "${KV_HOST_HOST}:${KV_HOST_PORT}:6379"
-    command: /bin/sh -c "redis-server /usr/local/etc/redis/redis.conf --requirepass ${REDIS_PASSWORD}"
     restart: always
   server:
     profiles: [ "all" ]