From 5377efef2a4e15016b9495625e0c83007be1ebb2 Mon Sep 17 00:00:00 2001 From: Falk Reimann Date: Thu, 25 Oct 2018 10:51:15 +0200 Subject: [PATCH] Keystone v3 support with properties --- Dockerfile | 5 ++++- src/main/resources/run-docker-container.sh | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c90a15..33a6016 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,10 @@ ENV \ JCLOUDS_REGION="" \ JCLOUDS_REGIONS="us-east-1" \ JCLOUDS_IDENTITY="remote-identity" \ - JCLOUDS_CREDENTIAL="remote-credential" + JCLOUDS_CREDENTIAL="remote-credential" \ + JCLOUDS_KEYSTONE_VERSION="" \ + JCLOUDS_KEYSTONE_SCOPE="" \ + JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME="" EXPOSE 80 VOLUME /data diff --git a/src/main/resources/run-docker-container.sh b/src/main/resources/run-docker-container.sh index 082d3a0..dee490a 100755 --- a/src/main/resources/run-docker-container.sh +++ b/src/main/resources/run-docker-container.sh @@ -15,6 +15,9 @@ exec java \ -Djclouds.endpoint=${JCLOUDS_ENDPOINT} \ -Djclouds.region=${JCLOUDS_REGION} \ -Djclouds.regions=${JCLOUDS_REGIONS} \ + -Djclouds.keystone.version=${JCLOUDS_KEYSTONE_VERSION} \ + -Djclouds.keystone.scope=${JCLOUDS_KEYSTONE_SCOPE} \ + -Djclouds.keystone.project-domain-name=${JCLOUDS_KEYSTONE_PROJECT_DOMAIN_NAME} \ -Djclouds.filesystem.basedir=/data \ -jar /opt/s3proxy/s3proxy \ --properties /dev/null