Merge 10d6eddb6e into 035003969a

Merge branch 'master' into add-missing-s3-variables
Bump stable to 30.0.4
2025-07-23 07:38:06 +02:00 · 2024-12-13 10:01:01 +01:00 · 2024-12-13 10:00:58 +01:00 · 2024-12-12 21:33:41 +00:00 · 2024-12-12 12:01:29 +00:00 · 2024-11-17 11:56:40 +01:00
11 changed files with 41 additions and 27 deletions
--- a/.config/s3.config.php
+++ b/.config/s3.config.php
@ -19,7 +19,14 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
        // required for some non Amazon S3 implementations
        'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
        // required for older protocol versions
-        'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false'
+        'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false',
+        'concurrency' => getenv('OBJECTSTORE_S3_CONCURRENCY') ?: '',
+        'proxy' => getenv('OBJECTSTORE_S3_PROXY') ?: '',
+        'timeout' => getenv('OBJECTSTORE_S3_TIMEOUT') ?: '',
+        'uploadPartSize' => getenv('OBJECTSTORE_S3_UPLOADPARTSIZE') ?:'',
+        'putSizeLimit' => getenv('OBJECTSTORE_S3_PUTSIZELIMIT') ?: '',
+        'version' => getenv('OBJECTSTORE_S3_VERSION') ?: '',
+        'verify_bucket_exists' => getenv('OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS') ?: ''
      )
    )
  );
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@ -140,7 +140,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14

 RUN set -ex; \
    fetchDeps=" \
@ -150,8 +150,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -128,8 +128,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 28.0.12
+ENV NEXTCLOUD_VERSION 28.0.14

 RUN set -ex; \
    fetchDeps=" \
@ -135,8 +135,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -140,7 +140,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -150,8 +150,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -128,8 +128,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.2
+ENV NEXTCLOUD_VERSION 30.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -135,8 +135,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/README.md
+++ b/README.md
@ -265,6 +265,13 @@ To use an external S3 compatible object store as primary storage, set the follow
 - `OBJECTSTORE_S3_OBJECT_PREFIX` (default: `urn:oid:`): Prefix to prepend to the fileid
 - `OBJECTSTORE_S3_AUTOCREATE` (default: `true`): Create the container if it does not exist
 - `OBJECTSTORE_S3_SSE_C_KEY` (not set by default): Base64 encoded key with a maximum length of 32 bytes for server side encryption (SSE-C)
+- `OBJECTSTORE_S3_CONCURRENCY` (default: `5`) defines the maximum number of concurrent multipart uploads
+- `OBJECTSTORE_S3_PROXY` (default: `false`)
+- `OBJECTSTORE_S3_TIMEOUT` (default: `15`)
+- `OBJECTSTORE_S3_UPLOADPARTSIZE` (default: `524288000`)
+- `OBJECTSTORE_S3_PUTSIZELIMIT` (default: `104857600`)
+- `OBJECTSTORE_S3_VERSION` (default: `latest`)
+- `OBJECTSTORE_S3_VERIFY_BUCKET_EXISTS` (default: `true`)

 Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.

--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-stable_channel='30.0.2'
+stable_channel='30.0.4'

 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
--- a/latest.txt
+++ b/latest.txt
@ -1 +1 @@
-30.0.2
+30.0.4
--- a/versions.json
+++ b/versions.json
@ -1,9 +1,9 @@
 {
  "30": {
    "branch": "30",
-    "version": "30.0.2",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc",
+    "version": "30.0.4",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
@ -53,9 +53,9 @@
  },
  "28": {
    "branch": "28",
-    "version": "28.0.12",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc",
+    "version": "28.0.14",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
Author	SHA1	Message	Date
Jesse Hitch	cc9635f765	Merge `10d6eddb6e` into `035003969a`	2024-12-13 10:01:01 +01:00
Jesse Hitch	10d6eddb6e	Merge branch 'master' into add-missing-s3-variables	2024-12-13 10:00:58 +01:00
J0WI	035003969a	Bump stable to 30.0.4 Signed-off-by: J0WI <J0WI@users.noreply.github.com>	2024-12-12 21:33:41 +00:00
GitHub Workflow	f413890332	Runs update.sh	2024-12-12 12:01:29 +00:00
Jesse Hitch	41b06485b1	Merge branch 'master' into add-missing-s3-variables	2024-11-17 11:56:40 +01:00
Jesse Hitch	0f899fe772	Update .config/s3.config.php - don't set defaults for new s3 values Signed-off-by: Jesse Hitch <jessebot@linux.com>	2024-09-24 11:14:06 +02:00
jessebot	040b7411a4	allow setting s3 concurrency, proxy, timeout, uploadPartSize, putSizeLimit, version, and verify_bucket_exists Signed-off-by: jessebot <jessebot@linux.com>	2024-07-29 12:48:13 +02:00
 @ -1 +1 @@
 .0.2
 .0.4