Merge branch 'master' of github.com:APSL/docker-thumbor into 5.2.1e

APSL · May 7, 2016 · dfdd779 · dfdd779
2 parents 61a4647 + 55ecd49
commit dfdd779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/docker-compose-examples/aws-s3-storage.yml b/docker-compose-examples/aws-s3-storage.yml
@@ -10,6 +10,9 @@ thumbor:
     DETECTORS: ['thumbor.detectors.feature_detector','thumbor.detectors.face_detector',]
     AWS_ACCESS_KEY_ID:  # put your AWS_ACCESS_KEY_ID here
     AWS_SECRET_ACCESS_KEY:  # put your AWS_SECRET_ACCESS_KEY here
+    # Is needed for buckets that demand the new signing algorithm (v4)
+    # S3_USE_SIGV4: true
+    # TC_AWS_REGION: eu-central-1
     TC_AWS_STORAGE_BUCKET: thumbor-docker
     TC_AWS_STORAGE_ROOT_PATH: storage
     TC_AWS_RESULT_STORAGE_BUCKET: thumbor-docker

diff --git a/docker-compose-examples/production.yml b/docker-compose-examples/production.yml
@@ -8,6 +8,9 @@ thumbor:
     DETECTORS: ['thumbor.detectors.queued_detector.queued_complete_detector',]
     AWS_ACCESS_KEY_ID: # put your AWS_ACCESS_KEY here
     AWS_SECRET_ACCESS_KEY: # put your AWS_SECRET_ACCESS_KEY here
+    # Is needed for buckets that demand the new signing algorithm (v4)
+    # S3_USE_SIGV4: true
+    # TC_AWS_REGION: eu-central-1
     TC_AWS_LOADER_BUCKET: bucket-name
     LOADER: tc_aws.loaders.s3_loader
     SECURITY_KEY: SECURIZE_ME