From ec0f56a5b4ca0e54b17bd0ffb340b17e2d9d3c5c Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Fri, 21 Aug 2020 10:13:06 +0900
Subject: [PATCH] Quote all parameters to Docker script

This addresses and issue with non-file GCS credentials with embedded
newlines.  Fixes #328.
---
 src/main/resources/run-docker-container.sh | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/run-docker-container.sh b/src/main/resources/run-docker-container.sh
index 9aa7e40..cb3ff52 100755
--- a/src/main/resources/run-docker-container.sh
+++ b/src/main/resources/run-docker-container.sh
@@ -1,26 +1,26 @@
 #!/bin/sh
 
 exec java \
-    -DLOG_LEVEL=${LOG_LEVEL} \
-    -Ds3proxy.endpoint=http://0.0.0.0:80 \
-    -Ds3proxy.virtual-host=${S3PROXY_VIRTUALHOST} \
-    -Ds3proxy.authorization=${S3PROXY_AUTHORIZATION} \
-    -Ds3proxy.identity=${S3PROXY_IDENTITY} \
-    -Ds3proxy.credential=${S3PROXY_CREDENTIAL} \
-    -Ds3proxy.cors-allow-all=${S3PROXY_CORS_ALLOW_ALL} \
+    -DLOG_LEVEL="${LOG_LEVEL}" \
+    -Ds3proxy.endpoint="http://0.0.0.0:80" \
+    -Ds3proxy.virtual-host="${S3PROXY_VIRTUALHOST}" \
+    -Ds3proxy.authorization="${S3PROXY_AUTHORIZATION}" \
+    -Ds3proxy.identity="${S3PROXY_IDENTITY}" \
+    -Ds3proxy.credential="${S3PROXY_CREDENTIAL}" \
+    -Ds3proxy.cors-allow-all="${S3PROXY_CORS_ALLOW_ALL}" \
     -Ds3proxy.cors-allow-origins="${S3PROXY_CORS_ALLOW_ORIGINS}" \
     -Ds3proxy.cors-allow-methods="${S3PROXY_CORS_ALLOW_METHODS}" \
     -Ds3proxy.cors-allow-headers="${S3PROXY_CORS_ALLOW_HEADERS}" \
-    -Ds3proxy.ignore-unknown-headers=${S3PROXY_IGNORE_UNKNOWN_HEADERS} \
-    -Djclouds.provider=${JCLOUDS_PROVIDER} \
-    -Djclouds.identity=${JCLOUDS_IDENTITY} \
-    -Djclouds.credential=${JCLOUDS_CREDENTIAL} \
-    -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 \
+    -Ds3proxy.ignore-unknown-headers="${S3PROXY_IGNORE_UNKNOWN_HEADERS}" \
+    -Djclouds.provider="${JCLOUDS_PROVIDER}" \
+    -Djclouds.identity="${JCLOUDS_IDENTITY}" \
+    -Djclouds.credential="${JCLOUDS_CREDENTIAL}" \
+    -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