From 0e725c6fa53a2aacc10dc65dc6dad684a4ece227 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 4 Mar 2024 21:00:00 +0000 Subject: [PATCH 1/4] Revert "update docker-entrypoint.sh" (#2175) --- docker-entrypoint.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 53f96466..5b627f07 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" From 399f27e70738d34926d79cae7dbe56a1de39421e Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Mon, 4 Mar 2024 21:00:17 +0000 Subject: [PATCH 2/4] Runs update.sh --- 26/apache/entrypoint.sh | 6 ------ 26/fpm-alpine/entrypoint.sh | 6 ------ 26/fpm/entrypoint.sh | 6 ------ 27/apache/entrypoint.sh | 6 ------ 27/fpm-alpine/entrypoint.sh | 6 ------ 27/fpm/entrypoint.sh | 6 ------ 28/apache/entrypoint.sh | 6 ------ 28/fpm-alpine/entrypoint.sh | 6 ------ 28/fpm/entrypoint.sh | 6 ------ 9 files changed, 54 deletions(-) diff --git a/26/apache/entrypoint.sh b/26/apache/entrypoint.sh index 53f96466..5b627f07 100755 --- a/26/apache/entrypoint.sh +++ b/26/apache/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/26/fpm-alpine/entrypoint.sh b/26/fpm-alpine/entrypoint.sh index 53f96466..5b627f07 100755 --- a/26/fpm-alpine/entrypoint.sh +++ b/26/fpm-alpine/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/26/fpm/entrypoint.sh b/26/fpm/entrypoint.sh index 53f96466..5b627f07 100755 --- a/26/fpm/entrypoint.sh +++ b/26/fpm/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/27/apache/entrypoint.sh b/27/apache/entrypoint.sh index 53f96466..5b627f07 100755 --- a/27/apache/entrypoint.sh +++ b/27/apache/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/27/fpm-alpine/entrypoint.sh b/27/fpm-alpine/entrypoint.sh index 53f96466..5b627f07 100755 --- a/27/fpm-alpine/entrypoint.sh +++ b/27/fpm-alpine/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/27/fpm/entrypoint.sh b/27/fpm/entrypoint.sh index 53f96466..5b627f07 100755 --- a/27/fpm/entrypoint.sh +++ b/27/fpm/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/28/apache/entrypoint.sh b/28/apache/entrypoint.sh index 53f96466..5b627f07 100755 --- a/28/apache/entrypoint.sh +++ b/28/apache/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/28/fpm-alpine/entrypoint.sh b/28/fpm-alpine/entrypoint.sh index 53f96466..5b627f07 100755 --- a/28/fpm-alpine/entrypoint.sh +++ b/28/fpm-alpine/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" diff --git a/28/fpm/entrypoint.sh b/28/fpm/entrypoint.sh index 53f96466..5b627f07 100755 --- a/28/fpm/entrypoint.sh +++ b/28/fpm/entrypoint.sh @@ -276,10 +276,4 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP run_path before-starting fi -echo "⚠️⚠️⚠️" -echo "This image is maintained by community volunteers and designed for expert use." -echo "For quick and easy deployment that supports the full set of Nextcloud Hub features, use the Nextcloud All-in-One docker container maintained by Nextcloud GmbH." -echo "See https://github.com/nextcloud/all-in-one#nextcloud-all-in-one" -echo "⚠️⚠️⚠️ " - exec "$@" From 9034966f1a9d5d84930e836c7e63cc016bad9c5d Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 4 Mar 2024 21:01:25 +0000 Subject: [PATCH 3/4] Remove Travis file (#2176) Signed-off-by: J0WI --- .travis/test-example-dockerfiles.sh | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100755 .travis/test-example-dockerfiles.sh diff --git a/.travis/test-example-dockerfiles.sh b/.travis/test-example-dockerfiles.sh deleted file mode 100755 index e28a7d7f..00000000 --- a/.travis/test-example-dockerfiles.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -set -e - -image="$1" - -cd .examples/dockerfiles - -dirs=( */ ) -dirs=( "${dirs[@]%/}" ) -for dir in "${dirs[@]}"; do - if [ -d "$dir/$VARIANT" ]; then - ( - cd "$dir/$VARIANT" - sed -ri -e 's/^FROM .*/FROM '"$image"'/g' 'Dockerfile' - docker build -t "$image-$dir" . - ) - fi -done From f9ce81fb7fa05e854bbdac7a180b267e2403e93c Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 4 Mar 2024 21:50:47 +0000 Subject: [PATCH 4/4] Add FTP module back (#2152) (#2169) Signed-off-by: J0WI --- 26/apache/Dockerfile | 2 ++ 26/fpm-alpine/Dockerfile | 2 ++ 26/fpm/Dockerfile | 2 ++ 27/apache/Dockerfile | 2 ++ 27/fpm-alpine/Dockerfile | 2 ++ 27/fpm/Dockerfile | 2 ++ 28/apache/Dockerfile | 2 ++ 28/fpm-alpine/Dockerfile | 2 ++ 28/fpm/Dockerfile | 2 ++ Dockerfile-alpine.template | 2 ++ Dockerfile-debian.template | 2 ++ 11 files changed, 22 insertions(+) diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile index 7c59ef34..8c11c63f 100644 --- a/26/apache/Dockerfile +++ b/26/apache/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/26/fpm-alpine/Dockerfile b/26/fpm-alpine/Dockerfile index be623342..4c39c6be 100644 --- a/26/fpm-alpine/Dockerfile +++ b/26/fpm-alpine/Dockerfile @@ -36,11 +36,13 @@ RUN set -ex; \ postgresql-dev \ ; \ \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/26/fpm/Dockerfile b/26/fpm/Dockerfile index 610034d3..31574108 100644 --- a/26/fpm/Dockerfile +++ b/26/fpm/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/27/apache/Dockerfile b/27/apache/Dockerfile index 64e94040..f6965648 100644 --- a/27/apache/Dockerfile +++ b/27/apache/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/27/fpm-alpine/Dockerfile b/27/fpm-alpine/Dockerfile index 20736951..f328b4be 100644 --- a/27/fpm-alpine/Dockerfile +++ b/27/fpm-alpine/Dockerfile @@ -36,11 +36,13 @@ RUN set -ex; \ postgresql-dev \ ; \ \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/27/fpm/Dockerfile b/27/fpm/Dockerfile index 482eef19..e888ff3b 100644 --- a/27/fpm/Dockerfile +++ b/27/fpm/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile index 364ab384..87a1e990 100644 --- a/28/apache/Dockerfile +++ b/28/apache/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile index 7567896a..831d98b0 100644 --- a/28/fpm-alpine/Dockerfile +++ b/28/fpm-alpine/Dockerfile @@ -36,11 +36,13 @@ RUN set -ex; \ postgresql-dev \ ; \ \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile index f8629906..afd78ba5 100644 --- a/28/fpm/Dockerfile +++ b/28/fpm/Dockerfile @@ -45,11 +45,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 905077bc..4553997a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -35,11 +35,13 @@ RUN set -ex; \ postgresql-dev \ ; \ \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cea5d93b..8b66dd34 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -44,11 +44,13 @@ RUN set -ex; \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ bcmath \ exif \ + ftp \ gd \ gmp \ intl \