From 885a4af69aa9c0e60a73f99b363638a1e5fc3f16 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 9 Jul 2018 15:34:08 +0300
Subject: [PATCH] Curator updates.

- Update Python to 3.7.
- Update Curator to 5.5.4.
- Fix crontab issue.
---
 curator/.dockerignore | 1 +
 curator/Dockerfile    | 8 +++++---
 curator/entrypoint    | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100755 curator/entrypoint

diff --git a/curator/.dockerignore b/curator/.dockerignore
index 72e8ffc..91445b9 100644
--- a/curator/.dockerignore
+++ b/curator/.dockerignore
@@ -1 +1,2 @@
 *
+!entrypoint
diff --git a/curator/Dockerfile b/curator/Dockerfile
index 7fdad66..699e66f 100644
--- a/curator/Dockerfile
+++ b/curator/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.6-alpine
-RUN pip install --no-cache-dir elasticsearch-curator==5.4.1
-CMD /usr/sbin/crond -f
+FROM python:3.7-alpine
+RUN pip install --progress-bar=off --no-cache-dir elasticsearch-curator==5.5.4
+COPY --chown=root:root entrypoint /
+ENTRYPOINT [ "/entrypoint" ]
+CMD [ "/usr/sbin/crond", "-fd7" ]
 HEALTHCHECK --timeout=1s CMD pgrep crond || exit 1
diff --git a/curator/entrypoint b/curator/entrypoint
new file mode 100755
index 0000000..a41e5bb
--- /dev/null
+++ b/curator/entrypoint
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -eu
+
+crontab -u nobody /etc/crontabs/nobody
+eval exec "$@"
-- 
GitLab