From 7e165bce0fdf85d2fa91c0c48845c57b8ca5f8a1 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 28 Dec 2019 16:05:17 -0800
Subject: [PATCH] Better reporting from script
---
.gitlab-ci.yml | 8 ++------
context/Dockerfile | 4 +++-
context/s3-purge.sh | 7 ++++++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 392840e..a18eef1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,7 @@ lint:dockerfile:
- mkdir ~/.config
- cp ./.hadolint.yaml ~/.config/hadolint.yaml
script:
- - |
- set -eo pipefail
- find . -name "Dockerfile" -execdir hadolint {} \;
+ - hadolint ./context/Dockerfile
lint:shell-script:
stage: test
@@ -27,9 +25,7 @@ lint:shell-script:
before_script:
- shellcheck -V
script:
- - |
- set -eo pipefail
- find . -name "*.sh" -exec shellcheck {} \;
+ - shellcheck ./context/s3-purge.sh
#
# IMAGE BUILDS/PUSHES
diff --git a/context/Dockerfile b/context/Dockerfile
index c969c9d..32a1b91 100644
--- a/context/Dockerfile
+++ b/context/Dockerfile
@@ -17,7 +17,9 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
+RUN touch /var/log/s3-purge
+
COPY s3-purge.sh /usr/local/bin/s3-purge
COPY crontab /etc/cron.d/s3-purge
-CMD ["tail", "-f", "/dev/null"]
+CMD ["tail", "-f", "/var/log/s3-purge"]
diff --git a/context/s3-purge.sh b/context/s3-purge.sh
index 005a77a..9d22ef8 100755
--- a/context/s3-purge.sh
+++ b/context/s3-purge.sh
@@ -6,11 +6,14 @@ export BUCKET_NAME
EXPIRE_AGE_DAYS=$(cat /s3_expire_days)
export EXPIRE_AGE_DAYS
+echo '==='
+date
+
s3cmd --config=/s3_config ls s3://"${BUCKET_NAME}" | while read -r line;
do
createDate=$(echo "$line"|awk '{print $1" "$2}')
createDate=$(date -d"$createDate" +%s)
- olderThan=$(date -d"-$EXPIRE_AGE_DAYS" +%s)
+ olderThan=$(date -d"-$EXPIRE_AGE_DAYS days" +%s)
if [[ $createDate -lt $olderThan ]]
then
fileName=$(echo "$line"|awk '{print $4}')
@@ -21,3 +24,5 @@ s3cmd --config=/s3_config ls s3://"${BUCKET_NAME}" | while read -r line;
fi
fi
done;
+
+echo '---'
--
GitLab