Merge upstream 2.8.0

.dockerignore

@@ -0,0 +1,4 @@
+# Exclude everything from context that is not used by COPY steps in the Dockerfile
+*
+!/target/s3proxy
+!/src/main/resources/run-docker-container.sh

.github/dependabot.yml

@@ -9,7 +9,8 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
-  - package-ecosystem: "maven" # See documentation for possible values
+  - package-ecosystem: "maven"
     directory: "/" # Location of package manifests
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 20

.github/workflows/ci-main.yml

@@ -1,4 +1,5 @@
 name: Main CI
+
 on:
   push:
     branches:
@@ -24,13 +25,13 @@ jobs:
       container_revision: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: false
           persist-credentials: false
       - name: Docker meta
         id: docker_action_meta
-        uses: docker/metadata-action@v5.7.0
+        uses: docker/metadata-action@v5.8.0
         with:
           images: |
             name=ghcr.io/${{ github.repository }}/container
@@ -50,16 +51,16 @@ jobs:
     runs-on: ubuntu-24.04-arm
     needs: [meta]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: "recursive"
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "11"
           cache: "maven"
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.11"
           cache: "pip"
@@ -87,18 +88,18 @@ jobs:
           mvn test -Ds3proxy.test.conf=s3proxy-filesystem-nio2.conf -Dtest=AwsSdkTest
 
       - name: Install Azurite
-        run: npx --yes --loglevel info azurite@3.34 --version
+        run: npx --yes --loglevel info azurite@3.35 --version
       - name: Start Azurite
         shell: bash
-        run: npx --yes azurite@3.34 azurite-blob &
+        run: npx --yes azurite@3.35 azurite-blob &
       - name: Maven Test with Azurite
         run: |
           # TODO: run other test classes
           mvn test -Ds3proxy.test.conf=s3proxy-azurite.conf -Dtest=AwsSdkTest
 
       - name: Install Minio
         run: |
-          curl -o minio https://dl.min.io/server/minio/release/linux-$(uname -m | sed -e s/aarch64/arm64/ -e s/x86_64/amd64/)/minio
+          curl --fail --silent --output minio https://dl.min.io/server/minio/release/linux-$(uname -m | sed -e s/aarch64/arm64/ -e s/x86_64/amd64/)/minio
           chmod +x minio
       - name: Start Minio
         run: |
@@ -142,12 +143,12 @@ jobs:
     runs-on: ubuntu-24.04-arm
     needs: [runTests, meta]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+      - uses: actions/checkout@v5
+      - uses: actions/download-artifact@v5
         with:
           name: s3proxy
           path: target
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: pom
           path: .
@@ -175,7 +176,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ needs.meta.outputs.container_tags }}
           labels: ${{ needs.meta.outputs.container_labels }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/eclipse-temurin:17-jre
+FROM docker.io/library/eclipse-temurin:21-jre
 LABEL maintainer="Andrew Gaul <andrew@gaul.org>"
 
 WORKDIR /opt/s3proxy
@@ -12,7 +12,7 @@
     src/main/resources/run-docker-container.sh \
     /opt/s3proxy/
 
 ENV \
     LOG_LEVEL="info" \
     S3PROXY_AUTHORIZATION="aws-v2-or-v4" \
     S3PROXY_ENDPOINT="http://0.0.0.0:80" \

README.md

@@ -109,11 +109,13 @@ S3Proxy can modify its behavior based on middlewares:
 * [bucket locator](https://github.com/gaul/s3proxy/wiki/Middleware-bucket-locator)
 * [eventual consistency modeling](https://github.com/gaul/s3proxy/wiki/Middleware---eventual-consistency)
 * [large object mocking](https://github.com/gaul/s3proxy/wiki/Middleware-large-object-mocking)
+* [latency](https://github.com/gaul/s3proxy/wiki/Middleware-latency)
 * [read-only](https://github.com/gaul/s3proxy/wiki/Middleware-read-only)
 * [regex rename blobs](https://github.com/gaul/s3proxy/wiki/Middleware-regex)
 * [sharded backend containers](https://github.com/gaul/s3proxy/wiki/Middleware-sharded-backend)
 * [storage class override](https://github.com/gaul/s3proxy/wiki/Middleware-storage-class-override)
 * [user metadata replacer](https://github.com/gaul/s3proxy/wiki/Middleware-user-metadata-replacer)
+* [no cache override](https://github.com/gaul/s3proxy/wiki/Middleware-no-cache)
 
 ## SSL Support
 
@@ -138,6 +140,7 @@ S3Proxy has broad compatibility with the S3 API, however, it does not support:
 
 S3Proxy emulates the following operations:
 
+* conditional PUT object when using If-Match or If-None-Match
 * copy multi-part objects, see [#76](https://github.com/gaul/s3proxy/issues/76)
 
 S3Proxy has basic CORS preflight and actual request/response handling. It can be configured within the properties