- Finalised podman migration

- Some minor feature requests in the selection specialist

docker/compose_test.yaml

@@ -12,7 +12,7 @@ x-common-variables: &common-variables
   DB_HOST: minty.ask-eve-ai-local.com
   DB_USER: luke
   DB_PASS: 'Skywalker!'
-  DB_NAME: eveai
+  DB_NAME: eveai_test
   DB_PORT: '5432'
   FLASK_ENV: test
   FLASK_DEBUG: true
@@ -47,7 +47,7 @@ name: eveai_test
 
 services:
   nginx:
-    image: josakola/nginx:latest
+    image: ${REGISTRY_PREFIX:-}josakola/nginx:latest
     ports:
       - 4080:80
     environment:
@@ -60,10 +60,10 @@ services:
       - eveai_chat_client
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_app:
-    image: josakola/eveai_app:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_app:latest
     ports:
       - 4001:5001
     expose:
@@ -86,10 +86,10 @@ services:
       start_period: 30s
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_workers:
-    image: josakola/eveai_workers:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_workers:latest
     expose:
       - 8000
     environment:
@@ -104,10 +104,10 @@ services:
         condition: service_healthy
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_chat_client:
-    image: josakola/eveai_chat_client:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_chat_client:latest
     ports:
       - 4004:5004
     expose:
@@ -130,10 +130,10 @@ services:
       start_period: 30s
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_chat_workers:
-    image: josakola/eveai_chat_workers:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_chat_workers:latest
     expose:
       - 8000
     environment:
@@ -146,10 +146,10 @@ services:
         condition: service_healthy
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_api:
-    image: josakola/eveai_api:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_api:latest
     ports:
       - 4003:5003
     expose:
@@ -172,10 +172,10 @@ services:
       start_period: 30s
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_beat:
-    image: josakola/eveai_beat:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_beat:latest
     environment:
       <<: *common-variables
       COMPONENT_NAME: eveai_beat
@@ -186,10 +186,10 @@ services:
         condition: service_healthy
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   eveai_entitlements:
-    image: josakola/eveai_entitlements:latest
+    image: ${REGISTRY_PREFIX:-}josakola/eveai_entitlements:latest
     expose:
       - 8000
     environment:
@@ -204,11 +204,11 @@ services:
         condition: service_healthy
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   redis:
     image: redis:7.2.5
-    restart: no
+    restart: unless-stopped
     ports:
       - "4006:6379"
     volumes:
@@ -222,7 +222,7 @@ services:
       - eveai-test-network
 
   flower:
-    image: josakola/flower:latest
+    image: ${REGISTRY_PREFIX:-}josakola/flower:latest
     environment:
       <<: *common-variables
     ports:
@@ -231,7 +231,7 @@ services:
       - redis
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   minio:
     image: minio/minio
@@ -255,11 +255,10 @@ services:
       start_period: 30s
     networks:
       - eveai-test-network
-    restart: "no"
+    restart: unless-stopped
 
   prometheus:
-    image: josakola/prometheus:${EVEAI_VERSION:-latest}
-    container_name: prometheus
+    image: ${REGISTRY_PREFIX:-}josakola/prometheus:${EVEAI_VERSION:-latest}
     ports:
       - "4010:9090"
     volumes:
@@ -270,7 +269,7 @@ services:
       - '--web.console.libraries=/etc/prometheus/console_libraries'
       - '--web.console.templates=/etc/prometheus/consoles'
       - '--web.enable-lifecycle'
-    restart: no
+    restart: unless-stopped
     networks:
       - eveai-test-network
 
@@ -283,8 +282,7 @@ services:
       - eveai-test-network
 
   grafana:
-    image: josakola/grafana:${EVEAI_VERSION:-latest}
-    container_name: grafana
+    image: ${REGISTRY_PREFIX:-}josakola/grafana:${EVEAI_VERSION:-latest}
     ports:
       - "4012:3000"
     volumes:
@@ -293,7 +291,7 @@ services:
       - GF_SECURITY_ADMIN_USER=admin
       - GF_SECURITY_ADMIN_PASSWORD=admin
       - GF_USERS_ALLOW_SIGN_UP=false
-    restart: no
+    restart: unless-stopped
     depends_on:
       - prometheus
     networks: