From 881dda40a4235f729138148f57f99660975402cd Mon Sep 17 00:00:00 2001 From: Timur Saikaliev Date: Tue, 11 Jun 2024 16:30:42 +0300 Subject: [PATCH] configure maximum-timeskew with environment variable --- src/main/java/org/gaul/s3proxy/S3Proxy.java | 2 +- src/main/resources/run-docker-container.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java index d7bf0489..47293467 100644 --- a/src/main/java/org/gaul/s3proxy/S3Proxy.java +++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java @@ -303,7 +303,7 @@ public static Builder fromProperties(Properties properties) String maximumTimeSkew = properties.getProperty( S3ProxyConstants.PROPERTY_MAXIMUM_TIME_SKEW); - if (maximumTimeSkew != null) { + if (maximumTimeSkew != null && !maximumTimeSkew.trim().isEmpty()) { builder.maximumTimeSkew(Integer.parseInt(maximumTimeSkew)); } diff --git a/src/main/resources/run-docker-container.sh b/src/main/resources/run-docker-container.sh index 7b601d8a..47492436 100755 --- a/src/main/resources/run-docker-container.sh +++ b/src/main/resources/run-docker-container.sh @@ -22,6 +22,7 @@ exec java \ -Ds3proxy.encrypted-blobstore-salt="${S3PROXY_ENCRYPTED_BLOBSTORE_SALT}" \ -Ds3proxy.v4-max-non-chunked-request-size="${S3PROXY_V4_MAX_NON_CHUNKED_REQ_SIZE:-33554432}" \ -Ds3proxy.read-only-blobstore="${S3PROXY_READ_ONLY_BLOBSTORE:-false}" \ + -Ds3proxy.maximum-timeskew="${S3PROXY_MAXIMUM_TIMESKEW}" \ -Djclouds.provider="${JCLOUDS_PROVIDER}" \ -Djclouds.identity="${JCLOUDS_IDENTITY}" \ -Djclouds.credential="${JCLOUDS_CREDENTIAL}" \