From 0c52cc6eefcf2e582ec4083750baf8392e58ca4c Mon Sep 17 00:00:00 2001 From: Hugo Slabbert Date: Wed, 15 Aug 2018 22:16:13 -0700 Subject: [PATCH 1/2] switch to python:3.7-alpine3.8 and flatten some layers --- Dockerfile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33d8341..b2705dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,15 @@ -FROM debian:jessie -MAINTAINER Ilya Stepanov +FROM python:3.7-alpine3.8 -RUN apt-get update && \ - apt-get install -y python python-pip cron && \ - rm -rf /var/lib/apt/lists/* +LABEL version="0.2" +LABEL maintainer="Ilya Stepanov " -RUN pip install s3cmd +COPY s3cfg start.sh sync.sh get.sh / -ADD s3cfg /root/.s3cfg - -ADD start.sh /start.sh -RUN chmod +x /start.sh - -ADD sync.sh /sync.sh -RUN chmod +x /sync.sh - -ADD get.sh /get.sh -RUN chmod +x /get.sh +RUN pip install s3cmd \ + && mv /s3cfg /root/.s3cfg \ + && chmod +x /start.sh \ + && chmod +x /sync.sh \ + && chmod +x /get.sh ENTRYPOINT ["/start.sh"] CMD [""] From 38cffce096cece4d6e8ebf951b9add21a30b6f0e Mon Sep 17 00:00:00 2001 From: Hugo Slabbert Date: Fri, 17 Aug 2018 19:54:09 -0700 Subject: [PATCH 2/2] alpine: ash not bash; just log to STDOUT --- get.sh | 2 +- start.sh | 11 +++-------- sync.sh | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/get.sh b/get.sh index bd81e2c..17bb82a 100644 --- a/get.sh +++ b/get.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff --git a/start.sh b/start.sh index 3db3218..2acc298 100644 --- a/start.sh +++ b/start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -18,15 +18,10 @@ elif [[ "$1" == 'get' ]]; then elif [[ "$1" == 'delete' ]]; then exec /usr/local/bin/s3cmd del -r "$S3_PATH" else - LOGFIFO='/var/log/cron.fifo' - if [[ ! -e "$LOGFIFO" ]]; then - mkfifo "$LOGFIFO" - fi CRON_ENV="PARAMS='$PARAMS'" CRON_ENV="$CRON_ENV\nDATA_PATH='$DATA_PATH'" CRON_ENV="$CRON_ENV\nS3_PATH='$S3_PATH'" - echo -e "$CRON_ENV\n$CRON_SCHEDULE /sync.sh > $LOGFIFO 2>&1" | crontab - + echo -e "$CRON_ENV\n$CRON_SCHEDULE /sync.sh" | crontab - crontab -l - cron - tail -f "$LOGFIFO" + crond -f fi diff --git a/sync.sh b/sync.sh index d11d754..61d9922 100644 --- a/sync.sh +++ b/sync.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e