From c83394d97e8ebfe54393e1763953f3039f8c4ec0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Sat, 26 Nov 2022 06:27:18 -0800 Subject: [PATCH 01/17] Update GitHub Actions to use new bashbrew action (#1861) This should fix errors that the old code would've run into thanks to the update to Go 1.18, and should help prevent them in the future by pinning to a specific release of both Bashbrew and the related scripts. Signed-off-by: Tianon Gravi Signed-off-by: Tianon Gravi --- .github/workflows/images.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 474e3a97..ae9762a6 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -20,15 +20,15 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - uses: docker-library/bashbrew@v0.1.5 - id: generate-jobs name: Generate Jobs run: | - git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew - strategy="$(GITHUB_REPOSITORY=nextcloud ~/bashbrew/scripts/github-actions/generate.sh)" - strategy="$(~/bashbrew/scripts/github-actions/munge-i386.sh -c <<<"$strategy")" + strategy="$(GITHUB_REPOSITORY=nextcloud "$BASHBREW_SCRIPTS/github-actions/generate.sh")" + strategy="$("$BASHBREW_SCRIPTS/github-actions/munge-i386.sh" -c <<<"$strategy")" + echo "strategy=$strategy" >> "$GITHUB_OUTPUT" jq . <<<"$strategy" # sanity check / debugging aid - echo "::set-output name=strategy::$strategy" test: needs: init @@ -36,7 +36,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Run update.sh script From 24440af0d5684a81601ab96478dd447b85a44dee Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 28 Nov 2022 16:12:46 +0000 Subject: [PATCH 02/17] Enhance shell syntax (#1868) Signed-off-by: J0WI Signed-off-by: J0WI --- docker-entrypoint.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index cad78817..3175361f 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else From 48f223fc7f3131f2f1526ddb12e779396acadb20 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Mon, 28 Nov 2022 16:13:06 +0000 Subject: [PATCH 03/17] Runs update.sh --- 23/apache/entrypoint.sh | 7 +++---- 23/fpm-alpine/entrypoint.sh | 7 +++---- 23/fpm/entrypoint.sh | 7 +++---- 24/apache/entrypoint.sh | 7 +++---- 24/fpm-alpine/entrypoint.sh | 7 +++---- 24/fpm/entrypoint.sh | 7 +++---- 25/apache/entrypoint.sh | 7 +++---- 25/fpm-alpine/entrypoint.sh | 7 +++---- 25/fpm/entrypoint.sh | 7 +++---- 9 files changed, 27 insertions(+), 36 deletions(-) diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh index cad78817..3175361f 100755 --- a/23/apache/entrypoint.sh +++ b/23/apache/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh index cad78817..3175361f 100755 --- a/23/fpm-alpine/entrypoint.sh +++ b/23/fpm-alpine/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh index cad78817..3175361f 100755 --- a/23/fpm/entrypoint.sh +++ b/23/fpm/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/24/apache/entrypoint.sh b/24/apache/entrypoint.sh index cad78817..3175361f 100755 --- a/24/apache/entrypoint.sh +++ b/24/apache/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/24/fpm-alpine/entrypoint.sh b/24/fpm-alpine/entrypoint.sh index cad78817..3175361f 100755 --- a/24/fpm-alpine/entrypoint.sh +++ b/24/fpm-alpine/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/24/fpm/entrypoint.sh b/24/fpm/entrypoint.sh index cad78817..3175361f 100755 --- a/24/fpm/entrypoint.sh +++ b/24/fpm/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/25/apache/entrypoint.sh b/25/apache/entrypoint.sh index cad78817..3175361f 100755 --- a/25/apache/entrypoint.sh +++ b/25/apache/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/25/fpm-alpine/entrypoint.sh b/25/fpm-alpine/entrypoint.sh index cad78817..3175361f 100755 --- a/25/fpm-alpine/entrypoint.sh +++ b/25/fpm-alpine/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else diff --git a/25/fpm/entrypoint.sh b/25/fpm/entrypoint.sh index cad78817..3175361f 100755 --- a/25/fpm/entrypoint.sh +++ b/25/fpm/entrypoint.sh @@ -59,9 +59,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP group="${APACHE_RUN_GROUP:-www-data}" # strip off any '#' symbol ('#1000' is valid syntax for Apache) - pound='#' - user="${user#$pound}" - group="${group#$pound}" + user="${user#'#'}" + group="${group#'#'}" ;; *) # php-fpm user='www-data' @@ -217,7 +216,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN" - NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1)) + NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1)) done fi else From 29ef76288ac29416b3b9ea86238101d2b6923478 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 1 Dec 2022 00:16:52 +0000 Subject: [PATCH 04/17] Fix #1021 (#1871) --- .examples/dockerfiles/full/apache/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile index 27a10f86..179307cc 100644 --- a/.examples/dockerfiles/full/apache/Dockerfile +++ b/.examples/dockerfiles/full/apache/Dockerfile @@ -5,6 +5,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ ffmpeg \ + ghostscript \ libmagickcore-6.q16-6-extra \ procps \ smbclient \ From 6103e074d81396c235fb453a88f518104cf35382 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 1 Dec 2022 00:19:39 +0000 Subject: [PATCH 05/17] Fix #1021 (#1872) Signed-off-by: J0WI Signed-off-by: J0WI --- .examples/dockerfiles/full/fpm/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile index 76f16b5c..218f63bd 100644 --- a/.examples/dockerfiles/full/fpm/Dockerfile +++ b/.examples/dockerfiles/full/fpm/Dockerfile @@ -5,6 +5,7 @@ RUN set -ex; \ apt-get update; \ apt-get install -y --no-install-recommends \ ffmpeg \ + ghostscript \ libmagickcore-6.q16-6-extra \ procps \ smbclient \ From 540648f7edee606349f4499e1c989e9c106331a9 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 8 Dec 2022 21:52:41 +0000 Subject: [PATCH 06/17] Runs update.sh --- 23/apache/Dockerfile | 2 +- 23/fpm-alpine/Dockerfile | 2 +- 23/fpm/Dockerfile | 2 +- 24/apache/Dockerfile | 2 +- 24/fpm-alpine/Dockerfile | 2 +- 24/fpm/Dockerfile | 2 +- 25/apache/Dockerfile | 2 +- 25/fpm-alpine/Dockerfile | 2 +- 25/fpm/Dockerfile | 2 +- latest.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile index eb774dc3..fe2cb684 100644 --- a/23/apache/Dockerfile +++ b/23/apache/Dockerfile @@ -123,7 +123,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 23.0.11 +ENV NEXTCLOUD_VERSION 23.0.12 RUN set -ex; \ fetchDeps=" \ diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile index 2c2757c8..1fcc954c 100644 --- a/23/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 23.0.11 +ENV NEXTCLOUD_VERSION 23.0.12 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile index 198da7e1..a1ac26f4 100644 --- a/23/fpm/Dockerfile +++ b/23/fpm/Dockerfile @@ -115,7 +115,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 23.0.11 +ENV NEXTCLOUD_VERSION 23.0.12 RUN set -ex; \ fetchDeps=" \ diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index b0a5fa2c..0870dfa3 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -123,7 +123,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 24.0.7 +ENV NEXTCLOUD_VERSION 24.0.8 RUN set -ex; \ fetchDeps=" \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 124e2891..76da3d24 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.7 +ENV NEXTCLOUD_VERSION 24.0.8 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index 01d50bfa..6072e191 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -115,7 +115,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.7 +ENV NEXTCLOUD_VERSION 24.0.8 RUN set -ex; \ fetchDeps=" \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index accae666..879d34f5 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -123,7 +123,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 25.0.1 +ENV NEXTCLOUD_VERSION 25.0.2 RUN set -ex; \ fetchDeps=" \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 1b068789..c3aa4b9c 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.1 +ENV NEXTCLOUD_VERSION 25.0.2 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 34a7a1ab..041afbbd 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -115,7 +115,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.1 +ENV NEXTCLOUD_VERSION 25.0.2 RUN set -ex; \ fetchDeps=" \ diff --git a/latest.txt b/latest.txt index 9d0cd2ef..6584dd0c 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -25.0.1 +25.0.2 From 04ab3157e4f1197a9f8f4b91cf2430586356dd9a Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 8 Dec 2022 22:44:37 +0000 Subject: [PATCH 07/17] Bump stable Version to 25 (fix #1865) (#1878) --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 8c11204a..bd62c763 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -stable_channel='24.0.7' +stable_channel='25.0.2' self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" From c1a52325422d08def6aa9d30028e04a96432abf0 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Tue, 17 Jan 2023 16:41:48 +0000 Subject: [PATCH 08/17] Runs update.sh --- 24/apache/Dockerfile | 2 +- 24/fpm-alpine/Dockerfile | 2 +- 24/fpm/Dockerfile | 2 +- 25/apache/Dockerfile | 2 +- 25/fpm-alpine/Dockerfile | 2 +- 25/fpm/Dockerfile | 2 +- latest.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index 0870dfa3..23a9c7b9 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -123,7 +123,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 24.0.8 +ENV NEXTCLOUD_VERSION 24.0.9 RUN set -ex; \ fetchDeps=" \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 76da3d24..594d55fd 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.8 +ENV NEXTCLOUD_VERSION 24.0.9 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index 6072e191..2c328bae 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -115,7 +115,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.8 +ENV NEXTCLOUD_VERSION 24.0.9 RUN set -ex; \ fetchDeps=" \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index 879d34f5..9fd73e8b 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -123,7 +123,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 25.0.2 +ENV NEXTCLOUD_VERSION 25.0.3 RUN set -ex; \ fetchDeps=" \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index c3aa4b9c..07565f41 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.2 +ENV NEXTCLOUD_VERSION 25.0.3 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 041afbbd..7d35b0b9 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -115,7 +115,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.2 +ENV NEXTCLOUD_VERSION 25.0.3 RUN set -ex; \ fetchDeps=" \ diff --git a/latest.txt b/latest.txt index 6584dd0c..b4e48e14 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -25.0.2 +25.0.3 From c66b03b8c60377161b9f526edd982f815b3938d3 Mon Sep 17 00:00:00 2001 From: thomasmerz Date: Tue, 17 Jan 2023 19:01:42 +0100 Subject: [PATCH 09/17] =?UTF-8?q?=F0=9F=A9=B9=20fix=20deprecation=20warnin?= =?UTF-8?q?g:=20Node.js=2012=20actions=20are=20deprecated.=20(#1885)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🩹 fix deprecation warning: Node.js 12 actions are deprecated. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/. Please update the following actions to use Node.js 16: actions/checkout@master Using version v3, latest or master: actions/checkout#689 Signed-off-by: Thomas Merz * Update .github/workflows/update-sh.yml Co-authored-by: J0WI Signed-off-by: thomasmerz Signed-off-by: Thomas Merz Signed-off-by: thomasmerz Co-authored-by: J0WI --- .github/workflows/update-sh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index b9b79170..4e03239a 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -13,7 +13,7 @@ jobs: name: Run update.sh script runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run update.sh script run: ./update.sh - name: Commit files From 2ffebc1e3583b87e78eb2098b2386411ebee6bce Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 17 Jan 2023 18:45:16 +0000 Subject: [PATCH 10/17] Bump stable to 25.0.3 (#1900) Signed-off-by: J0WI Signed-off-by: J0WI --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index bd62c763..ab82b105 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -stable_channel='25.0.2' +stable_channel='25.0.3' self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" From e4f5b95e1ec32f744dffc8e958d11a322c14f217 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Wed, 8 Feb 2023 06:50:46 -0800 Subject: [PATCH 11/17] Enable JIT (#1829) Signed-off-by: Varun Patil --- Dockerfile-alpine.template | 2 ++ Dockerfile-debian.template | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 84d97395..c33b1971 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -85,6 +85,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4d2e6044..5427e2c2 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -99,6 +99,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ From 2a5b0881cd61e0fcd5611bf93034d68e562564f8 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Wed, 8 Feb 2023 14:52:36 +0000 Subject: [PATCH 12/17] Runs update.sh --- 23/apache/Dockerfile | 2 ++ 23/fpm-alpine/Dockerfile | 2 ++ 23/fpm/Dockerfile | 2 ++ 24/apache/Dockerfile | 2 ++ 24/fpm-alpine/Dockerfile | 2 ++ 24/fpm/Dockerfile | 2 ++ 25/apache/Dockerfile | 2 ++ 25/fpm-alpine/Dockerfile | 2 ++ 25/fpm/Dockerfile | 2 ++ 9 files changed, 18 insertions(+) diff --git a/23/apache/Dockerfile b/23/apache/Dockerfile index fe2cb684..d1a7e28a 100644 --- a/23/apache/Dockerfile +++ b/23/apache/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/23/fpm-alpine/Dockerfile b/23/fpm-alpine/Dockerfile index 1fcc954c..28cd103a 100644 --- a/23/fpm-alpine/Dockerfile +++ b/23/fpm-alpine/Dockerfile @@ -86,6 +86,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/23/fpm/Dockerfile b/23/fpm/Dockerfile index a1ac26f4..8822a209 100644 --- a/23/fpm/Dockerfile +++ b/23/fpm/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index 23a9c7b9..8bdc73c0 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index 594d55fd..a0abc2b2 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -86,6 +86,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index 2c328bae..567ae69a 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index 9fd73e8b..f5b868ad 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 07565f41..48c82242 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -86,6 +86,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 7d35b0b9..892d866e 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -98,6 +98,8 @@ RUN { \ echo 'opcache.memory_consumption=128'; \ echo 'opcache.save_comments=1'; \ echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.jit=1255'; \ + echo 'opcache.jit_buffer_size=128M'; \ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \ \ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \ From f49b1edcaa258dae458a00d55b0cc596090c601d Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Wed, 8 Feb 2023 06:58:59 -0800 Subject: [PATCH 13/17] add note about running non-root with cron (#1901) Signed-off-by: Adam Monsen --- .examples/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.examples/README.md b/.examples/README.md index 6358bc34..b505b3ac 100644 --- a/.examples/README.md +++ b/.examples/README.md @@ -18,6 +18,9 @@ Example | Description [smb](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/smb) | adds dependencies required to use smb shares [full](https://github.com/nextcloud/docker/tree/master/.examples/dockerfiles/full) | adds dependencies for ALL optional packages and cron functionality via supervisor (as in the `cron` example Dockerfile). +### cron +NOTE: [this container must run as root or `cron.php` will not run](https://github.com/nextcloud/docker/issues/1899). + ### full The `full` Dockerfile example adds dependencies for all optional packages suggested by nextcloud that may be needed for some features (e.g. Video Preview Generation), as stated in the [Administration Manual](https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html). From d1d0d89ba75986237f7b5b7812406b1f08a35c40 Mon Sep 17 00:00:00 2001 From: Adam Monsen Date: Fri, 17 Feb 2023 06:13:12 -0800 Subject: [PATCH 14/17] Enable MariaDB binary log (#1881) * Enable MariaDB binary log This resolves a warning in the database server log: [Warning] You need to use --log-bin to make --binlog-format work. Pros: * support for point-in-time recovery * necessary for replication Cons: * slows down database operations ("slightly", per the manual) * takes up disk space (mitigated by `--expire-logs-days=2`) See also: * * Alternatives: 1. Do not add `--log-bin`. Remove `--binlog-format` instead. This causes the least amount of change for existing installations. Signed-off-by: Adam Monsen * remove --expire-logs-days=2 mariadb flag This better aligns with recommendations in the Nextcloud documentation. Also: the flag isn't necessary. There are already set times for cleanup: The MySQL and MariaDB documentation both state that binary logs will be purged on startup and flush/rotation. Signed-off-by: Adam Monsen --------- Signed-off-by: Adam Monsen --- .../docker-compose/insecure/mariadb/apache/docker-compose.yml | 2 +- .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 2 +- .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 2 +- .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 2 +- README.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml index d5e30393..facf6fd2 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: db: image: mariadb:10.5 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index c3c94f39..1b9b3039 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: db: image: mariadb:10.5 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml index eaf18678..d88c9db4 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: db: image: mariadb:10.5 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml index 80088993..c4e6fec3 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: db: image: mariadb:10.5 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql diff --git a/README.md b/README.md index 0da37051..969df074 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,7 @@ services: db: image: mariadb:10.5 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW volumes: - db:/var/lib/mysql environment: @@ -287,7 +287,7 @@ services: db: image: mariadb:10.5 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW volumes: - db:/var/lib/mysql environment: From c13521ce12067c6aed4b675ac75bc6c71335c155 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sun, 19 Feb 2023 19:33:07 +0100 Subject: [PATCH 15/17] README: update to reflect support of these images vs enterprise and AIO (#1916) * README: update to reflect support of these images vs enterprise and AIO Signed-off-by: Simon L * address review by J0WI Signed-off-by: Simon L --------- Signed-off-by: Simon L --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 969df074..e0cb2441 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ A safe home for all your data. Access & share your files, calendars, contacts, m ![logo](https://cdn.rawgit.com/nextcloud/docker/80dd587d847b184ba95d7187a2a7a56ae4cbbb7b/logo.svg) +This Docker micro-service image is developed and maintained by the Nextcloud community. Nextcloud GmbH does not offer support for this Docker image. When you are looking to get professional support, you can become an [enterprise](https://nextcloud.com/enterprise/) customer or use [AIO](https://github.com/nextcloud/all-in-one#nextcloud-all-in-one). + # How to use this image This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from. From d266acccf0434dd9fedba63218cfde912be40cc5 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 23 Feb 2023 21:46:37 +0000 Subject: [PATCH 16/17] Runs update.sh --- 24/apache/Dockerfile | 2 +- 24/fpm-alpine/Dockerfile | 2 +- 24/fpm/Dockerfile | 2 +- 25/apache/Dockerfile | 2 +- 25/fpm-alpine/Dockerfile | 2 +- 25/fpm/Dockerfile | 2 +- latest.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/24/apache/Dockerfile b/24/apache/Dockerfile index 8bdc73c0..fb349264 100644 --- a/24/apache/Dockerfile +++ b/24/apache/Dockerfile @@ -125,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 24.0.9 +ENV NEXTCLOUD_VERSION 24.0.10 RUN set -ex; \ fetchDeps=" \ diff --git a/24/fpm-alpine/Dockerfile b/24/fpm-alpine/Dockerfile index a0abc2b2..dd187250 100644 --- a/24/fpm-alpine/Dockerfile +++ b/24/fpm-alpine/Dockerfile @@ -105,7 +105,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.9 +ENV NEXTCLOUD_VERSION 24.0.10 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile index 567ae69a..08a1680c 100644 --- a/24/fpm/Dockerfile +++ b/24/fpm/Dockerfile @@ -117,7 +117,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 24.0.9 +ENV NEXTCLOUD_VERSION 24.0.10 RUN set -ex; \ fetchDeps=" \ diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index f5b868ad..29170ec0 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -125,7 +125,7 @@ RUN a2enmod headers rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 25.0.3 +ENV NEXTCLOUD_VERSION 25.0.4 RUN set -ex; \ fetchDeps=" \ diff --git a/25/fpm-alpine/Dockerfile b/25/fpm-alpine/Dockerfile index 48c82242..1dc04677 100644 --- a/25/fpm-alpine/Dockerfile +++ b/25/fpm-alpine/Dockerfile @@ -105,7 +105,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.3 +ENV NEXTCLOUD_VERSION 25.0.4 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/25/fpm/Dockerfile b/25/fpm/Dockerfile index 892d866e..0e359e43 100644 --- a/25/fpm/Dockerfile +++ b/25/fpm/Dockerfile @@ -117,7 +117,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 25.0.3 +ENV NEXTCLOUD_VERSION 25.0.4 RUN set -ex; \ fetchDeps=" \ diff --git a/latest.txt b/latest.txt index b4e48e14..16a5a23a 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -25.0.3 +25.0.4 From c5a8a8863b1db95fb45c872a0078b177347db959 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 23 Feb 2023 22:44:19 +0000 Subject: [PATCH 17/17] 25.0.4 (#1924) --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index ab82b105..ee48c9c9 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -stable_channel='25.0.3' +stable_channel='25.0.4' self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"