From 5b395b29f90a0e023e63f582dcdba4ecc1e36ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20K=C3=B6nig?= Date: Tue, 16 Aug 2016 19:38:06 +0200 Subject: [PATCH] Move base image to Alpine --- Dockerfile | 10 ++++++---- backup.sh | 4 ++-- restore.sh | 2 ++ run.sh | 11 +++-------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index c49694b..f62970c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,11 @@ -FROM ubuntu:14.04.3 +FROM alpine:3.4 MAINTAINER technik@myfoodmap.de -RUN apt-get update && apt-get install -y \ - python-pip \ - xz-utils +RUN apk add --update \ + py-pip \ + gpgme \ + xz \ + && rm -rf /var/cache/apk/* RUN pip install awscli diff --git a/backup.sh b/backup.sh index 0ad06bd..bf205bf 100644 --- a/backup.sh +++ b/backup.sh @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/sh -: ${BACKUP_DATE:=_$(date +"%Y-%m-%d_%H-%M")} +BACKUP_DATE=$(date +"%Y-%m-%d_%H-%M") cd /backup tar cJf ~/$S3_BUCKET_NAME$BACKUP_DATE.tar.xz ./* diff --git a/restore.sh b/restore.sh index 249689a..495a60f 100644 --- a/restore.sh +++ b/restore.sh @@ -1,3 +1,5 @@ +#!/bin/sh + gpg --import /keys/* aws s3 ls s3://$S3_BUCKET_NAME diff --git a/run.sh b/run.sh index 1dd7cfc..6ed7284 100644 --- a/run.sh +++ b/run.sh @@ -1,14 +1,9 @@ -#!/bin/bash +#!/bin/sh +# Import GPG public keys gpg --import /keys/* -cron - -# LS_COLORS is set to nothing and for some strange reason crontabs are not allowed to contain such env vars -unset LS_COLORS - -# Create crontab file -env | cat - > /backup.cron +# Create and install crontab file echo "$CRON_INTERVAL /backup.sh" >> /backup.cron crontab /backup.cron