Merge pull request #78 from udx/UAT-69

Dynamic home dir detection for modules [UAT-69]

Dockerfile

@@ -4,20 +4,20 @@ FROM ubuntu:24.04
 # Set the maintainer of the image
 LABEL maintainer="UDX CAG Team"
 
-# Define the user to be created
-ARG USER=udx
-ARG UID=500
-ARG GID=500
-
 # Set environment variables to avoid interactive prompts and set a fixed timezone
 ENV DEBIAN_FRONTEND=noninteractive \
     TZ=Etc/UTC \
-    USER=${USER} \
-    HOME=/home/${USER}
+    USER=udx \
+    UID=500 \
+    GID=500 \
+    HOME=/home/udx
 
 # Set the shell with pipefail option
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# Set user to root for installation
+USER root
+
 # Install necessary packages
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -110,9 +110,9 @@ RUN mkdir -p /var/log/supervisor /var/run/supervisor && \
     chown -R ${USER}:${USER} /var/log/supervisor /var/run/supervisor
 
 # Copy the CLI tool into the image
-COPY lib/cli.sh /usr/local/bin/udx_worker_mgmt
-RUN chmod +x /usr/local/bin/udx_worker_mgmt && \
-    ln -s /usr/local/bin/udx_worker_mgmt /usr/local/bin/worker    
+COPY lib/cli.sh /usr/local/bin/worker_mgmt
+RUN chmod +x /usr/local/bin/worker_mgmt && \
+    ln -s /usr/local/bin/worker_mgmt /usr/local/bin/worker    
 
 # Copy the bin, etc, and lib directories
 COPY etc/home /etc

etc/configs/worker/services.yml → etc/configs/worker/services.yaml

@@ -4,15 +4,15 @@ version: udx.io/worker-v1/service
 services:
   - name: "app_service"
     ignore: "true"
-    command: "sh /usr/local/scripts/main.sh"
+    command: "sh ./main.sh"
     autostart: "true"
     autorestart: "false"
     envs:
       - "KEY1=value1"
       - "KEY2=value2"
   - name: "another_service"
     ignore: "true"
-    command: "sh /usr/local/scripts/main.sh"
+    command: "sh ./main.sh"
     autostart: "true"
     autorestart: "true"
     envs: []

lib/process_manager.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Define paths
-DEFAULT_CONFIG_FILE="/usr/local/configs/worker/services.yml"
+DEFAULT_CONFIG_FILE="/usr/local/configs/worker/services.yaml"
 # Define the user-specific configuration path search
 # shellcheck disable=SC2227
-USER_CONFIG_PATH=$(find "/home/$USER" -name 'services.yaml' 2>/dev/null -print | head -n 1)
+USER_CONFIG_PATH=$(find "$HOME" -name 'services.yaml' 2>/dev/null -print | head -n 1)
 
 # Use the first user-specific config found; if none, use the default
 CONFIG_FILE="${USER_CONFIG_PATH:-$DEFAULT_CONFIG_FILE}"
@@ -73,7 +73,6 @@ parse_service_info() {
 
 # Function to start Supervisor with the generated configuration
 start_supervisor() {
-    echo "Starting Supervisor with the generated configuration..."
     supervisord
 }
 

lib/worker_config.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 # Paths for configurations
-BUILT_IN_CONFIG="/usr/local/configs/worker/default.yml"
-# Dynamically find user configuration in any subfolder of /home/$USER
+BUILT_IN_CONFIG="/usr/local/configs/worker/default.yaml"
+# Dynamically find user configuration in any subfolder of $HOME
 # shellcheck disable=SC2227
-USER_CONFIG=$(find "/home/$USER" -name 'worker.yaml' 2>/dev/null -print | head -n 1)
+USER_CONFIG=$(find "$HOME" -name 'worker.yaml' 2>/dev/null -print | head -n 1)
 MERGED_CONFIG="/usr/local/configs/worker/merged_worker.yaml"
 
 # Utility functions for logging