diff --git a/BankServices/RoutineEmailService/entrypoint.sh b/BankServices/RoutineEmailService/entrypoint.sh index 8f4bbaf..d1bc6ca 100644 --- a/BankServices/RoutineEmailService/entrypoint.sh +++ b/BankServices/RoutineEmailService/entrypoint.sh @@ -19,7 +19,7 @@ echo "PYTHONUNBUFFERED=1" >> /env.sh echo "PYTHONDONTWRITEBYTECODE=1" >> /env.sh # Make the environment file available to cron -echo "0 8 * * * . /env.sh && /run_app.sh >> /var/log/cron.log 2>&1" > /tmp/crontab_list +echo "0 8 * * * /run_app.sh >> /var/log/cron.log 2>&1" > /tmp/crontab_list crontab /tmp/crontab_list # Start cron diff --git a/BankServices/RoutineEmailService/run_app.sh b/BankServices/RoutineEmailService/run_app.sh index 8a05648..4e54fd4 100644 --- a/BankServices/RoutineEmailService/run_app.sh +++ b/BankServices/RoutineEmailService/run_app.sh @@ -1,19 +1,24 @@ #!/bin/bash -export EMAIL_HOST="${EMAIL_HOST}" -export EMAIL_USERNAME="${EMAIL_USERNAME}" -export EMAIL_PASSWORD="${EMAIL_PASSWORD}" -export EMAIL_PORT=${EMAIL_PORT} -export EMAIL_SEND=${EMAIL_SEND} -export DB_HOST="${DB_HOST}" -export DB_USER="${DB_USER}" -export DB_PASSWORD="${DB_PASSWORD}" -export DB_PORT=${DB_PORT} -export DB_NAME="${DB_NAME}" + +# Source the environment file directly +. /env.sh + +# Re-export all variables to ensure they're available to the Python script +export EMAIL_HOST +export EMAIL_USERNAME +export EMAIL_PASSWORD +export EMAIL_PORT +export EMAIL_SEND +export DB_HOST +export DB_USER +export DB_PASSWORD +export DB_PORT +export DB_NAME # Python environment variables -export PYTHONPATH=/ -export PYTHONUNBUFFERED=1 -export PYTHONDONTWRITEBYTECODE=1 +export PYTHONPATH +export PYTHONUNBUFFERED +export PYTHONDONTWRITEBYTECODE env >> /var/log/cron.log /usr/local/bin/python /app.py \ No newline at end of file