From 5a2b67569a7fd99ed6cf7246e0d2924758353649 Mon Sep 17 00:00:00 2001
From: Joe Roberts <joe.t.roberts@jpl.nasa.gov>
Date: Wed, 28 Jun 2023 19:26:07 -0700
Subject: [PATCH] GITC-4476 Added maxage and removed notifempty to prevent
 stuck logs

---
 build.sh                      | 3 ++-
 docker/logrotate.daily.httpd  | 2 +-
 docker/logrotate.hourly.httpd | 2 +-
 version.sh                    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 36be464d..b4b973c7 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,8 @@ docker build \
     .
 
 # Build the onearth-reproject image
-docker build --no-cache \
+docker build \
+    --no-cache \
     --build-arg ONEARTH_VERSION=$ONEARTH_VERSION \
     -f ./docker/reproject/Dockerfile \
     -t nasagibs/onearth-reproject:$ONEARTH_VERSION-$ONEARTH_RELEASE \
diff --git a/docker/logrotate.daily.httpd b/docker/logrotate.daily.httpd
index e350e47c..9d087928 100644
--- a/docker/logrotate.daily.httpd
+++ b/docker/logrotate.daily.httpd
@@ -1,8 +1,8 @@
 /var/log/httpd/*log {
     daily
     rotate 3
+    maxage 3
     missingok
-    notifempty
     sharedscripts
     compress
     delaycompress
diff --git a/docker/logrotate.hourly.httpd b/docker/logrotate.hourly.httpd
index 11e3fec6..32bb5d7b 100644
--- a/docker/logrotate.hourly.httpd
+++ b/docker/logrotate.hourly.httpd
@@ -1,8 +1,8 @@
 /var/log/httpd/*log {
     hourly
     rotate 3
+    maxage 1
     missingok
-    notifempty
     sharedscripts
     compress
     delaycompress
diff --git a/version.sh b/version.sh
index 552aff02..2920c5fe 100755
--- a/version.sh
+++ b/version.sh
@@ -4,4 +4,4 @@
 export ONEARTH_VERSION=2.7.1 # This must be manually incremented with each OnEarth version
 
 # The onearth release to use in the Docker image tag (e.g. onearth-wms:{ONEARTH_VERSION}-{ONEARTH_RELEASE}).
-export ONEARTH_RELEASE=5 # This must be manually incremented with each OnEarth build
+export ONEARTH_RELEASE=6 # This must be manually incremented with each OnEarth build