docker: create new container with cronjob tar-ing result daily

docker-compose.prod.yaml

@@ -11,6 +11,8 @@ services:
       - 8080:8080
     volumes:
       - persistent:/persistent:z
+    env_file:
+      - "files/.env"
 
 volumes:
   persistent:

docker-compose.yaml

@@ -14,10 +14,25 @@ services:
     volumes:
       - .:/opt/log-detective-website:z
       - persistent:/persistent
+    env_file:
+      - "files/env"
     environment:
       - ENV=devel
-      - FEEDBACK_DIR=/persistent/results
       - PYTHONPATH=/opt/log-detective-website
+
+  cron:
+    build:
+      context: .
+      dockerfile: docker/cron/Dockerfile
+    hostname: cron
+    command: "crond -f"
+    stdin_open: true
+    tty: true
+    volumes:
+      - persistent:/persistent
+    env_file:
+      - "files/env"
+
   # The frontend container is only a quality of life for development.
   # For production, we will simply compile the ClojureScript into JavaScript
   # and deploy it.
@@ -40,9 +55,10 @@ services:
       - 3333:3333
     volumes:
       - .:/opt/log-detective-website:z
+    env_file:
+      - "files/env"
     environment:
       - ENV=devel
-      - FEEDBACK_DIR=/persistent/results
 
 volumes:
   persistent:

docker/cron/Dockerfile

@@ -0,0 +1,14 @@
+FROM registry.fedoraproject.org/fedora:38
+MAINTAINER [email protected]
+
+RUN dnf -y update
+RUN dnf -y install cronie tar
+
+RUN touch /var/log/cron.log
+
+COPY files/cron/tar_persistent.sh /bin/tar_persistent
+RUN chmod +x /bin/tar_persistent
+
+COPY files/cron/crontab_daily /etc/cron.d/crontab_daily
+RUN chmod +x /etc/cron.d/crontab_daily
+RUN crontab /etc/cron.d/crontab_daily

docker/production/Dockerfile

@@ -1,7 +1,6 @@
 FROM registry.fedoraproject.org/fedora:38
 MAINTAINER [email protected]
 
-ENV FEEDBACK_DIR=/persistent/results
 ENV ENV=production
 
 RUN dnf -y update && \
@@ -19,6 +18,8 @@ RUN dnf -y update && \
                    sudo \
                    python3-ipdb \
                    findutils \
+                   cronie \
+                   tar \
     # Frontend
     && dnf -y install \
                    npm \
@@ -36,7 +37,6 @@ RUN npx shadow-cljs release app
 FROM registry.fedoraproject.org/fedora:38
 MAINTAINER [email protected]
 
-ENV FEEDBACK_DIR=/persistent/results
 ENV ENV=production
 
 RUN dnf -y install python3-fastapi \
@@ -52,8 +52,17 @@ RUN dnf -y install python3-fastapi \
 COPY --from=0 /src/frontend/public /src/frontend/public
 COPY --from=0 /src/backend /src/backend
 
-# According to the documentation, gunicorn is a valid production server
-# https://www.uvicorn.org/deployment/
+# set-up cron
+RUN touch /var/log/cron.log
+
+COPY files/cron/tar_persistent.sh /bin/tar_persistent
+RUN chmod +x /bin/tar_persistent
+
+COPY files/cron/crontab_daily /etc/cron.d/crontab_daily
+RUN chmod +x /etc/cron.d/crontab_daily
+RUN crontab /etc/cron.d/crontab_daily
+
+
 WORKDIR /src/backend
 ENV PYTHONPATH="${PYTHONPATH}:/src"
 

docker/production/start.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -m
+
+# According to the documentation, gunicorn is a valid production server
+# https://www.uvicorn.org/deployment/
+# TODO: We should put this into a config file
+gunicorn -k uvicorn.workers.UvicornWorker --certfile /persistent/letsencrypt/live/log-detective.com/cert.pem --keyfile /persistent/letsencrypt/live/log-detective.com/privkey.pem --ca-certs /persistent/letsencrypt/live/log-detective.com/fullchain.pem api:app -b 0.0.0.0:8080
+
+crond -f &
+
+fg %1

files/cron/crontab_daily

@@ -0,0 +1,5 @@
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# run every day at 1:05AM
+5 1 * * * root tar_persistent >> /var/log/cron.log 2>&1

files/cron/tar_persistent.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/sh
+
+# archive results tar_persistent.sh and remove the old ones
+FILE_NAME=data-$(date +%s).tar.gz
+tar -czvf $STORAGE_DIR/new-$FILE_NAME -C $FEEDBACK_DIR . && \
+    rm -f $STORAGE_DIR/data-*.tar.gz && \
+    mv $STORAGE_DIR/new-$FILE_NAME $STORAGE_DIR/$FILE_NAME

files/env

@@ -0,0 +1,2 @@
+STORAGE_DIR=/persistent
+FEEDBACK_DIR=/persistent/results