Merge pull request #193 from jwalters-gpsw/master

WAL-E needs AWS_INSTANCE_PROFILE=1 environment variable

Author: Matthew Fisher

Dockerfile

@@ -40,7 +40,7 @@ RUN buildDeps='gcc git libffi-dev libssl-dev python3-dev python3-pip python3-whe
     chown -R postgres /run/postgresql && \
     pip install --disable-pip-version-check --no-cache-dir \
         envdir==0.7 \
-        wal-e[aws,azure,google,swift]==v1.0.1 && \
+        wal-e[aws,azure,google,swift]==v1.0.2 && \
     # "upgrade" boto to 2.43.0 + the patch to fix minio connections
     pip install --disable-pip-version-check --no-cache-dir --upgrade git+https://github.com/deis/boto@88c980e56d1053892eb940d43a15a68af4ebb5e6 && \
     # cleanup

rootfs/docker-entrypoint-initdb.d/001_setup_envdir.sh

@@ -33,6 +33,8 @@ if [[ "$DATABASE_STORAGE" == "s3" || "$DATABASE_STORAGE" == "minio" ]]; then
   if [[ "$AWS_ACCESS_KEY_ID" != "" && "$AWS_SECRET_ACCESS_KEY" != "" ]]; then
     echo $AWS_ACCESS_KEY_ID > AWS_ACCESS_KEY_ID
     echo $AWS_SECRET_ACCESS_KEY > AWS_SECRET_ACCESS_KEY
+  else
+    echo "1" > AWS_INSTANCE_PROFILE
   fi
   echo $AWS_REGION > AWS_REGION
   echo $BUCKET_NAME > BUCKET_NAME