From 2224fc50c8dd3dfd5bdf33735e1d2addb1f11d05 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sun, 8 Nov 2020 10:45:46 +0100
Subject: [PATCH] grav

---
 apps/web/grav/Dockerfile      | 13 ++++++++-----
 apps/web/grav/deployment.yaml |  1 +
 apps/web/grav/supervisor.conf | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 apps/web/grav/supervisor.conf

diff --git a/apps/web/grav/Dockerfile b/apps/web/grav/Dockerfile
index ea51dc7..2b63586 100644
--- a/apps/web/grav/Dockerfile
+++ b/apps/web/grav/Dockerfile
@@ -6,15 +6,15 @@ ARG DEV_PKGS="zlib1g-dev libpng-dev libjpeg-dev libfreetype6-dev \
 	libcurl4-gnutls-dev libxml2-dev libonig-dev"
 	
 RUN apt-get update && \
-	apt-get install -y imagemagick git bash procps wget unzip dumb-init \
+	apt-get install -y git bash procps wget unzip supervisor \
 					php-fpm php-gd php-json php-curl php-dom php-xml php-yaml php-apcu \
-					php-opcache php-simplexml php-zip php-mbstring \ 
+					php-opcache php-simplexml php-zip php-mbstring cron \ 
 	&& mkdir /var/www \
 	&& chown www-data:www-data /var/www \
 	&& cd /var/www
 
 # CLeanup	
-RUN	apt-get remove -y --purge ${DEV_PKGS} && \
+RUN	apt-get remove -y --purge ${DEV_PKGS} exim4* && \
 	apt-get autoremove --purge -y && \
 	apt-get clean -y && \ 
 	rm -rf /var/lib/apt/lists/* && \
@@ -24,8 +24,11 @@ RUN mkdir /run/php && \
 	chown www-data:www-data /var/log /run/php && \
 	mkdir -p /etc/php/7.3/fpm/pool.d
 ADD docker-entrypoint.sh /
+ADD supervisor.conf /etc/supervisor.conf
 
 ENTRYPOINT ["/docker-entrypoint.sh"]	
 
-USER www-data
-CMD ["dumb-init", "/usr/sbin/php-fpm7.3", "--nodaemonize", "--force-stderr"]
+#USER www-data
+RUN (crontab -l; echo "* * * * * cd /var/www/grav;/usr/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -u www-data -
+#CMD ["dumb-init", "/usr/sbin/php-fpm7.3", "--nodaemonize", "--force-stderr"]
+CMD ["supervisord", "-c", "/etc/supervisor.conf"]
diff --git a/apps/web/grav/deployment.yaml b/apps/web/grav/deployment.yaml
index 3694309..075e158 100644
--- a/apps/web/grav/deployment.yaml
+++ b/apps/web/grav/deployment.yaml
@@ -47,6 +47,7 @@ spec:
          - >-
            wget -O /grav.zip "https://getgrav.org/download/core/grav-admin/latest" &&
            unzip -q /grav.zip &&
+           rm -rf grav-admin/user/pages/* &&
            cp -ru grav-admin/* /workdir/ &&
            rm -rf /grav.zip &&
            rm -rf /grav-admin &&
diff --git a/apps/web/grav/supervisor.conf b/apps/web/grav/supervisor.conf
new file mode 100644
index 0000000..48a45e7
--- /dev/null
+++ b/apps/web/grav/supervisor.conf
@@ -0,0 +1,14 @@
+[supervisord]
+nodaemon=true
+
+[program:cron]
+command=/usr/sbin/cron
+killasgroup=true
+stopasgroup=true
+redirect_stderr=true
+user=root
+
+
+[program:php-fpm]
+command=/usr/sbin/php-fpm7.3 --nodaemonize --force-stderr
+user=www-data
\ No newline at end of file