From 6199b6cd57227af8424960b67458b1428a5144ef Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Sun, 7 Dec 2014 07:46:17 +0100
Subject: [PATCH] run backups in the foreground

---
 per-user/lamp-git/Dockerfile  |  2 --
 per-user/lamp-git/backup.cron |  2 --
 per-user/lamp-git/run.sh      | 12 +++++++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 delete mode 100644 per-user/lamp-git/backup.cron

diff --git a/per-user/lamp-git/Dockerfile b/per-user/lamp-git/Dockerfile
index 3f0563b..6c13ac5 100644
--- a/per-user/lamp-git/Dockerfile
+++ b/per-user/lamp-git/Dockerfile
@@ -5,7 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update \
 	&& apt-get -yq install \
 		apache2 \
-                cron \
 		curl \
 		git \
 		libapache2-mod-php5 \
@@ -22,7 +21,6 @@ RUN apt-get update \
 # Add image configuration and scripts
 COPY default.conf /etc/apache2/sites-enabled/000-default.conf
 COPY run.sh /run.sh
-COPY backup.cron /etc/cron.d/backup.cron
 RUN sed -i "s/variables_order.*/variables_order = \"EGPCS\"/g" /etc/php5/apache2/php.ini \
 	&& a2enmod rewrite \
 	&& chmod 755 /run.sh
diff --git a/per-user/lamp-git/backup.cron b/per-user/lamp-git/backup.cron
deleted file mode 100644
index 97f12d8..0000000
--- a/per-user/lamp-git/backup.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-42 * * * * root cd /data; mysqldump --all-databases > dump.sql; git add *; git commit -am"backup `date`"
-
diff --git a/per-user/lamp-git/run.sh b/per-user/lamp-git/run.sh
index 87736e1..8ff2afb 100644
--- a/per-user/lamp-git/run.sh
+++ b/per-user/lamp-git/run.sh
@@ -11,4 +11,14 @@ exec cron &
 sleep 5
 mysql < /data/dump.sql
 source /etc/apache2/envvars
-exec apache2 -D FOREGROUND
+exec apache2 &
+cd /data
+while (1); do
+  mysqldump --all-databases > dump.sql;
+  git add *;
+  git commit -am"backup `date`";
+  git status;
+  date;
+  echo "Next backup in one hour...";
+  sleep 3540;
+done
-- 
2.21.0