Merge pull request #25 from frekele/master

merge master into stable

.gitignore

@@ -1 +1 @@
-/.idea/
+/.idea/

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 before_install:
   - sudo apt-get clean && sudo apt-get update -y
-  - sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine
+  - sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-ce
   - docker --version
   - git clone https://github.com/sstephenson/bats.git
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.5
 
 MAINTAINER frekele <[email protected]>
 
@@ -8,10 +8,10 @@ RUN apk add --update --no-cache \
        wget \
        git \
        python\
-       py-pip \
+       py2-pip \
        docker \
-    && curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 > /usr/bin/docker \
-    && chmod +x /usr/bin/docker \
+    #&& curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.12.6 > /usr/bin/docker \
+    #&& chmod +x /usr/bin/docker \
     && pip install --upgrade pip \
     && pip install awscli
 
@@ -22,17 +22,19 @@ RUN chmod -R +x /scripts
 ENV STORAGE_PROVIDER='' \
     BACKUP_NAME='' \
     DATA_PATH='/data/' \
+    DATA_PATH_EXCLUDE='' \
     GZIP_COMPRESSION='true' \
     CLEAN_DATA_BEFORE_RESTORE='false' \
     BACKUP_VERSION='' \
     CRON_SCHEDULE='' \
     AWS_ACCESS_KEY_ID='' \
     AWS_SECRET_ACCESS_KEY='' \
+    AWS_S3_BUCKET_CREATE='false' \
     AWS_S3_BUCKET_NAME='' \
     AWS_S3_PATH='/' \
     AWS_DEFAULT_REGION='us-east-1' \
     AWS_S3_OPTIONS=''
 
 ENTRYPOINT ["/scripts/run.sh"]
 
-CMD [""]
+CMD [""]