Merge pull request #11 from r-dvl/bugfix/crontab

Fix Crontab service

api/dockerfile

@@ -15,8 +15,8 @@ ENV VAULT_PASSWORD_FILE=/config/vault_password_file
 # Install dependencies
 COPY ./requirements.txt /api/requirements.txt
 
-# Install Ansible
-RUN apt-get update && apt-get install -y sshpass && \
+# Install Ansible and cron
+RUN apt-get update && apt-get install -y sshpass cron && \
     pip install --no-cache-dir --upgrade -r /api/requirements.txt && \
     pip install ansible
 
@@ -27,4 +27,10 @@ COPY ./v1 /api/v1
 # API listener port
 EXPOSE 8080
 
-CMD ["python3", "./main.py"]
+# Start cron service
+RUN service cron start
+
+# Copy startup script
+COPY ./start.sh /start.sh
+
+CMD ["/bin/bash", "/start.sh"]

api/start.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Start cron service
+service cron start
+
+# Start your application
+python3 ./main.py

api/v1/endpoints/crontab.py

@@ -5,7 +5,7 @@
 router = APIRouter()
 
 # Crontabs path
-path = '/crontabs'
+path = '/cron.d'
 
 @router.get("/read")
 def get_crontab(crontab: str = Query(..., description="Crontab name")):

api/v1/endpoints/playbooks.py

@@ -10,7 +10,7 @@
 # Playbooks path
 base_path = "/ansible-playbooks/playbooks/"
 scripts_path = "/ansible-playbooks/scripts/"
-crontab_path = '/crontabs/ansible'
+crontab_path = '/cron.d/ansible'
 
 @router.get("/get-playbooks")
 def get_playbooks():

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - 8080:8080
     volumes:
       - /DATA/AppData/ansible-manager/logs:/logs
-      - /DATA/AppData/ansible-manager/crontabs:/crontabs
+      - /DATA/AppData/ansible-manager/cron.d:/etc/cron.d
       - /DATA/AppData/ansible-manager/ansible-playbooks:/ansible-playbooks
       - /DATA/AppData/ansible-manager/config:/config
     environment: