feat: modernize image and change scheduler

Author: pascal-zarrad

Containerfile

@@ -11,17 +11,17 @@ ENV CONTAINER_UID=${CONTAINER_UID} \
 # Install logrotate and go-cron - also create logrotate user and group
 RUN addgroup -g $CONTAINER_GID logrotate && \
     adduser -u $CONTAINER_UID -G logrotate -h /usr/bin/logrotate.d -s /bin/bash -S logrotate && \
-    apk add --update tar gzip wget tzdata && \
+    apk add --update bash tar gzip tzdata tini && \
     if  [ "${LOGROTATE_VERSION}" = "latest" ]; \
     then apk add logrotate ; \
     else apk add "logrotate=${LOGROTATE_VERSION}"; \
     fi && \
     mkdir -p /usr/bin/logrotate.d && \
-    wget --no-check-certificate -O /tmp/go-cron.tar.gz https://github.com/michaloo/go-cron/releases/download/v0.0.2/go-cron.tar.gz && \
-    tar xvf /tmp/go-cron.tar.gz -C /usr/bin && \
-    apk del wget && \
     rm -rf /var/cache/apk/* && rm -rf /tmp/*
 
+# Install ofelia for cronjob scheduling
+COPY --from=docker.io/mcuadros/ofelia:0.3 /usr/bin/ofelia /usr/bin/ofelia
+
 # Available environment variables for this container
 ENV LOGROTATE_OLDDIR= \
     LOGROTATE_COMPRESSION= \

logrotate.d/logrotate-config.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Helper functions for manipulating logrotate configurationsfile
+# Helper functions for manipulating logrotate configuration file
 
 function createLogrotateConfigurationEntry() {
   local file="$1"
@@ -18,6 +18,7 @@ function createLogrotateConfigurationEntry() {
   local conf_prerotate="${13}"
   local conf_postrotate="${14}"
   local new_log=
+
   new_log=${file}" {"
   if [ "$file_user" != "UNKNOWN" ] && [ "$file_owner" != "UNKNOWN" ]; then
     new_log=${new_log}"\n  su ${file_user} ${file_owner}"

logrotate.d/logrotate-create-config.sh

@@ -1,20 +1,19 @@
 #!/bin/bash
 #
-# Creation of Logfile
+# Creation of logrotate configuration file based on environment variables
 
+# Logfile Crawling
 function handleSingleFile() {
   local singleFile="$1"
   local file_owner_user=$(stat -c %U ${singleFile})
   local file_owner_group=$(stat -c %G ${singleFile})
   local new_logrotate_entry=$(createLogrotateConfigurationEntry "${singleFile}" "${file_owner_user}" "${file_owner_group}" "${logrotate_copies}" "${logrotate_logfile_compression}" "${logrotate_logfile_compression_delay}" "${logrotate_mode}" "${logrotate_interval}" "${logrotate_size}" "${logrotate_dateformat}" "${logrotate_minsize}" "${logrotate_maxage}" "${logrotate_prerotate}" "${logrotate_postrotate}")
+
   echo "Inserting new ${singleFile} to /usr/bin/logrotate.d/logrotate.conf"
   insertConfigurationEntry "$new_logrotate_entry" "/usr/bin/logrotate.d/logrotate.conf"
 }
 
-# ----- Logfile Crawling ------
-
 log_dirs=""
-
 if [ -n "${LOGS_DIRECTORIES}" ]; then
   log_dirs=${LOGS_DIRECTORIES}
 else
@@ -23,7 +22,6 @@ fi
 
 logs_ending="log"
 LOGS_FILE_ENDINGS_INSTRUCTION=""
-
 if [ -n "${LOG_FILE_ENDINGS}" ]; then
   logs_ending=${LOG_FILE_ENDINGS}
 fi
@@ -63,10 +61,8 @@ do
   done
 done
 
-# ----- Take all Log in Subfolders ------
-
+# Take all log files in subfolder's
 all_log_dirs=""
-
 if [ -n "${ALL_LOGS_DIRECTORIES}" ]; then
   all_log_dirs=${ALL_LOGS_DIRECTORIES}
 fi

logrotate.d/logrotate.sh

@@ -24,7 +24,6 @@ EOF
 readonly logrotate_logstatus=${LOGROTATE_STATUSFILE:-"/logrotate-status/logrotate.status"}
 
 logrotate_olddir=""
-
 function resolveOldDir() {
   if [ -n "${LOGROTATE_OLDDIR}" ]; then
     logrotate_olddir="olddir "${LOGROTATE_OLDDIR}
@@ -69,41 +68,35 @@ logrotate_interval=${LOGROTATE_INTERVAL:-""}
 logrotate_copies=${LOGROTATE_COPIES:-"5"}
 
 logrotate_size=""
-
 function resolveLogrotateSize() {
   if [ -n "${LOGROTATE_SIZE}" ]; then
     logrotate_size="size "${LOGROTATE_SIZE}
   fi
 }
 
 logrotate_minsize=""
-
 function resolveMinSize() {
   if [ -n "${LOGROTATE_MINSIZE}" ]; then
     logrotate_minsize="minsize ${LOGROTATE_MINSIZE}"
   fi
 }
 
 logrotate_maxage=""
-
 function resolveMaxAge() {
   if [ -n "${LOGROTATE_MAXAGE}" ]; then
     logrotate_maxage="maxage ${LOGROTATE_MAXAGE}"
   fi
 }
 
 logrotate_autoupdate=true
-
 function resolveLogrotateAutoupdate() {
   if [ -n "${LOGROTATE_AUTOUPDATE}" ]; then
     logrotate_autoupdate="$(echo ${LOGROTATE_AUTOUPDATE,,})"
   fi
 }
 
 logrotate_prerotate=${LOGROTATE_PREROTATE_COMMAND:-""}
-
 logrotate_postrotate=${LOGROTATE_POSTROTATE_COMMAND:-""}
-
 logrotate_dateformat=${LOGROTATE_DATEFORMAT:-""}
 
 resolveSysloggerCommand

logrotate.d/update-logrotate.sh

@@ -9,7 +9,7 @@ set -e
 source /usr/bin/logrotate.d/logrotate.sh
 source /usr/bin/logrotate.d/logrotate-config.sh
 
-resetConfigurationFile
 
-#Create Logrotate Conf
+# Reset and then regenerate logrotate config
+resetConfigurationFile
 source /usr/bin/logrotate.d/logrotate-create-config.sh

ofelia/schedule-autoupdate.ini

@@ -0,0 +1,3 @@
+[job-local "logrotate-with-autoupdate"]
+schedule = @every 15s
+command = touch test.txt

ofelia/schedule-standard.ini

@@ -0,0 +1,3 @@
+[job-local "logrotate"]
+schedule = @every 15s
+command = touch test.txt