Merge pull request #1736 from maths/api-cron

Set up API demo server cron job

Author: sangwinc

api/docker/DockerfileDemo

@@ -1,7 +1,7 @@
 #This Docker file is for building the University of Edinburgh specific STACK API Demo server.
 #Please use the other Dockerfile in this folder.
 #Intermediate step installing dependencies
-FROM composer:lts as composer
+FROM composer:lts AS composer
 
 COPY / /work/
 
@@ -43,18 +43,18 @@ COPY / /srv/stack
 #Copy dependencies
 COPY --from=composer /work/api/vendor /srv/stack/api/vendor
 
-FROM base as development
+FROM base AS development
 
 #Enable xdebug extension in develop
 COPY /api/docker/files/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 RUN pecl install xdebug && \
     docker-php-ext-enable xdebug
 
-FROM development as profiling
+FROM development AS profiling
 
 COPY /api/docker/files/xdebug-profile.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-FROM base as production
+FROM base AS production
 
 #Enable opcache extension in production
 COPY /api/docker/files/opcache.ini /usr/local/etc/php/conf.d/opcache.ini
@@ -66,8 +66,11 @@ RUN docker-php-ext-install opcache && \
 # Required for building the Edinburgh demo server
 RUN a2enmod ssl && \
     apt-get update && \
-    apt install -y python3 python3-dev python3-venv libaugeas-dev gcc && \
+    apt-get install -y python3 python3-dev python3-venv libaugeas-dev gcc && \
     python3 -m venv /opt/certbot/ && \
     /opt/certbot/bin/pip install --upgrade pip && \
     /opt/certbot/bin/pip install certbot certbot-apache && \
-    echo "0 0,12 * * * root /opt/certbot/bin/python -c 'import random; import time; time.sleep(random.random() * 3600)' && certbot renew -q" | tee -a /etc/crontab > /dev/null
+    apt-get install -y cron
+
+COPY /api/docker/files/startcron /usr/sbin
+ENTRYPOINT ["startcron"]

api/docker/files/startcron

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+echo "0 0,12 * * * root /opt/certbot/bin/python -c 'import random; import time; time.sleep(random.random() * 3600)' && certbot renew -q" | tee -a /etc/cron.d/crontab > /dev/null
+service cron start
+/usr/sbin/apache2ctl -D FOREGROUND