From afc5dac58e73d571589c96ad830846b1a5a3b5c0 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Wed, 17 Jun 2020 23:51:51 +0200
Subject: [PATCH] [DBBackupRotation] Try to fix cron commands order in
 Dockerfile

---
 pica-db-backup-rotation/CHANGELOG.md       | 4 ++++
 pica-db-backup-rotation/Dockerfile         | 2 +-
 pica-db-backup-rotation/docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pica-db-backup-rotation/CHANGELOG.md b/pica-db-backup-rotation/CHANGELOG.md
index 58d90f5a..1c7ac6cf 100644
--- a/pica-db-backup-rotation/CHANGELOG.md
+++ b/pica-db-backup-rotation/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.4 (17-06-2020)
+
+* Fix crontab not scheduling because of instruction orders in Dockerfile
+
 ## v1.3 (05-04-2020)
 
 * Use `python:3.8-alpine` as base image instead of `python:3-slim-buster` (it comes already with `cron`, so we don't have to install it)
diff --git a/pica-db-backup-rotation/Dockerfile b/pica-db-backup-rotation/Dockerfile
index 01f3c682..6b54de64 100644
--- a/pica-db-backup-rotation/Dockerfile
+++ b/pica-db-backup-rotation/Dockerfile
@@ -5,5 +5,5 @@ RUN pip install --no-cache-dir "rotate-backups<9" "python-crontab<2.5"
 COPY start_rotation.py /start_rotation.py
 
 CMD /start_rotation.py && \
-    crond -f && \
     crontab /crontab.conf
+    crond -f -d 8 && \
diff --git a/pica-db-backup-rotation/docker-compose.yml b/pica-db-backup-rotation/docker-compose.yml
index 25c4685f..f08f62d1 100644
--- a/pica-db-backup-rotation/docker-compose.yml
+++ b/pica-db-backup-rotation/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   db-backup-rotation:
-    image: registry.picasoft.net/pica-db-backup-rotation:1.3
+    image: registry.picasoft.net/pica-db-backup-rotation:1.4
     container_name: db-backup-rotation
     volumes:
       - /DATA/BACKUP/:/backup/
-- 
GitLab