From f0439007bc24094c3bc0c1c62df8cd1384bd0d77 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Wed, 1 Jan 2020 08:26:50 -0800
Subject: [PATCH 1/2] Need cron to run...cron
---
context/Dockerfile | 7 ++++---
context/crontab | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/context/Dockerfile b/context/Dockerfile
index 32ca6ac..73d71ce 100644
--- a/context/Dockerfile
+++ b/context/Dockerfile
@@ -7,7 +7,9 @@ RUN echo "deb http://security.debian.org/ buster/updates main" >> /etc/apt/sourc
RUN apt-get update \
&& apt-get -y --no-install-recommends install \
- python3 python3-pip \
+ cron \
+ python3 \
+ python3-pip \
&& pip3 install setuptools \
&& pip3 install s3cmd \
&& s3cmd --version \
@@ -20,5 +22,4 @@ RUN apt-get update \
COPY s3-purge.sh /usr/local/bin/s3-purge
COPY crontab /etc/cron.d/s3-purge
-RUN touch /var/log/s3-purge
-CMD ["tail", "-F", "/var/log/s3-purge"]
+CMD ["cron", "-f"]
diff --git a/context/crontab b/context/crontab
index 21b4156..06a984d 100644
--- a/context/crontab
+++ b/context/crontab
@@ -1 +1 @@
-20 1 * * * root s3-purge >> /var/log/s3-purge 2>/dev/null
+20 1 * * * root s3-purge >> /var/log/s3-purge 2>/var/log/s3-purge-err
--
GitLab
From 41e5df9f4f3ace9e8e4f36c38659fd892785e2c7 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Thu, 2 Jan 2020 16:26:20 -0800
Subject: [PATCH 2/2] Don't bother with container registry, need to build for
specific architectures
---
context/crontab | 2 +-
docker-compose.yml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/context/crontab b/context/crontab
index 06a984d..928211e 100644
--- a/context/crontab
+++ b/context/crontab
@@ -1 +1 @@
-20 1 * * * root s3-purge >> /var/log/s3-purge 2>/var/log/s3-purge-err
+20 1 * * * root /usr/local/bin/s3-purge >> /var/log/s3-purge 2>/var/log/s3-purge-err
diff --git a/docker-compose.yml b/docker-compose.yml
index ff351a0..08073b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,9 @@
version: "3.7"
services:
s3_object_expirer:
- image: containers.ethitter.com:443/docker/s3-object-expirer:latest
+ image: s3-object-expirer:latest
+ build:
+ context: ./context
restart: unless-stopped
secrets:
- source: s3_config
--
GitLab