Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/docker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2022-09-01 17:25:06 +0300
committerGitHub <noreply@github.com>2022-09-01 17:25:06 +0300
commit685803da0b0aac9c3fbed01d0ecd553ffa5075a4 (patch)
treeb92e9161362ddb333bff9f407a152d2627cdd8ec
parentb71e398d5741a6797d35bdb582fa2b2a07fdfe04 (diff)
Remove 22 (#1813)
Signed-off-by: J0WI <J0WI@users.noreply.github.com> Signed-off-by: J0WI <J0WI@users.noreply.github.com>
-rw-r--r--22/apache/Dockerfile158
-rw-r--r--22/apache/config/apache-pretty-urls.config.php4
-rw-r--r--22/apache/config/apcu.config.php4
-rw-r--r--22/apache/config/apps.config.php15
-rw-r--r--22/apache/config/autoconfig.php41
-rw-r--r--22/apache/config/redis.config.php17
-rw-r--r--22/apache/config/reverse-proxy.config.php30
-rw-r--r--22/apache/config/s3.config.php27
-rw-r--r--22/apache/config/smtp.config.php22
-rw-r--r--22/apache/config/swift.config.php31
-rwxr-xr-x22/apache/cron.sh4
-rwxr-xr-x22/apache/entrypoint.sh228
-rw-r--r--22/apache/upgrade.exclude6
-rw-r--r--22/fpm-alpine/Dockerfile134
-rw-r--r--22/fpm-alpine/config/apcu.config.php4
-rw-r--r--22/fpm-alpine/config/apps.config.php15
-rw-r--r--22/fpm-alpine/config/autoconfig.php41
-rw-r--r--22/fpm-alpine/config/redis.config.php17
-rw-r--r--22/fpm-alpine/config/reverse-proxy.config.php30
-rw-r--r--22/fpm-alpine/config/s3.config.php27
-rw-r--r--22/fpm-alpine/config/smtp.config.php22
-rw-r--r--22/fpm-alpine/config/swift.config.php31
-rwxr-xr-x22/fpm-alpine/cron.sh4
-rwxr-xr-x22/fpm-alpine/entrypoint.sh228
-rw-r--r--22/fpm-alpine/upgrade.exclude6
-rw-r--r--22/fpm/Dockerfile150
-rw-r--r--22/fpm/config/apcu.config.php4
-rw-r--r--22/fpm/config/apps.config.php15
-rw-r--r--22/fpm/config/autoconfig.php41
-rw-r--r--22/fpm/config/redis.config.php17
-rw-r--r--22/fpm/config/reverse-proxy.config.php30
-rw-r--r--22/fpm/config/s3.config.php27
-rw-r--r--22/fpm/config/smtp.config.php22
-rw-r--r--22/fpm/config/swift.config.php31
-rwxr-xr-x22/fpm/cron.sh4
-rwxr-xr-x22/fpm/entrypoint.sh228
-rw-r--r--22/fpm/upgrade.exclude6
37 files changed, 0 insertions, 1721 deletions
diff --git a/22/apache/Dockerfile b/22/apache/Dockerfile
deleted file mode 100644
index c287940..0000000
--- a/22/apache/Dockerfile
+++ /dev/null
@@ -1,158 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.0-apache-bullseye
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- libldap-common \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
-
-# install the PHP extensions we need
-# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
-RUN set -ex; \
- \
- savedAptMark="$(apt-mark showmanual)"; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- libcurl4-openssl-dev \
- libevent-dev \
- libfreetype6-dev \
- libicu-dev \
- libjpeg-dev \
- libldap2-dev \
- libmcrypt-dev \
- libmemcached-dev \
- libpng-dev \
- libpq-dev \
- libxml2-dev \
- libmagickwand-dev \
- libzip-dev \
- libwebp-dev \
- libgmp-dev \
- ; \
- \
- debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- 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 \
- gd \
- intl \
- ldap \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- zip \
- gmp \
- ; \
- \
-# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.21; \
- pecl install memcached-3.2.0; \
- pecl install redis-5.3.7; \
- pecl install imagick-3.7.0; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- rm -r /tmp/pear; \
- \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
- apt-mark auto '.*' > /dev/null; \
- apt-mark manual $savedAptMark; \
- ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
- | awk '/=>/ { print $3 }' \
- | sort -u \
- | xargs -r dpkg-query -S \
- | cut -d: -f1 \
- | sort -u \
- | xargs -rt apt-mark manual; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=16'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=60'; \
- } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
- \
- echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
- \
- { \
- echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
- echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
- echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
- } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod headers rewrite remoteip ;\
- {\
- echo RemoteIPHeader X-Real-IP ;\
- echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
- echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
- echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
- } > /etc/apache2/conf-available/remoteip.conf;\
- a2enconf remoteip
-
-ENV NEXTCLOUD_VERSION 22.2.10
-
-RUN set -ex; \
- fetchDeps=" \
- gnupg \
- dirmngr \
- "; \
- apt-get update; \
- apt-get install -y --no-install-recommends $fetchDeps; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- gpgconf --kill all; \
- rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
- mkdir -p /usr/src/nextcloud/data; \
- mkdir -p /usr/src/nextcloud/custom_apps; \
- chmod +x /usr/src/nextcloud/occ; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
- rm -rf /var/lib/apt/lists/*
-
-COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/22/apache/config/apache-pretty-urls.config.php b/22/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8..0000000
--- a/22/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/22/apache/config/apcu.config.php b/22/apache/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
--- a/22/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/22/apache/config/apps.config.php b/22/apache/config/apps.config.php
deleted file mode 100644
index 4c37f72..0000000
--- a/22/apache/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
- 'apps_paths' => array (
- 0 => array (
- 'path' => OC::$SERVERROOT.'/apps',
- 'url' => '/apps',
- 'writable' => false,
- ),
- 1 => array (
- 'path' => OC::$SERVERROOT.'/custom_apps',
- 'url' => '/custom_apps',
- 'writable' => true,
- ),
- ),
-);
diff --git a/22/apache/config/autoconfig.php b/22/apache/config/autoconfig.php
deleted file mode 100644
index 92ad2a1..0000000
--- a/22/apache/config/autoconfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-$autoconfig_enabled = false;
-
-if (getenv('SQLITE_DATABASE')) {
- $AUTOCONFIG['dbtype'] = 'sqlite';
- $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE_FILE') && getenv('MYSQL_USER_FILE') && getenv('MYSQL_PASSWORD_FILE') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('MYSQL_DATABASE_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('MYSQL_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('MYSQL_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
- $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
- $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB_FILE') && getenv('POSTGRES_USER_FILE') && getenv('POSTGRES_PASSWORD_FILE') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('POSTGRES_DB_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('POSTGRES_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('POSTGRES_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
- $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
- $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-}
-
-if ($autoconfig_enabled) {
- $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
-}
diff --git a/22/apache/config/redis.config.php b/22/apache/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
--- a/22/apache/config/redis.config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-if (getenv('REDIS_HOST')) {
- $CONFIG = array(
- 'memcache.distributed' => '\OC\Memcache\Redis',
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => getenv('REDIS_HOST'),
- 'password' => (string) getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-
- if (getenv('REDIS_HOST_PORT') !== false) {
- $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
- } elseif (getenv('REDIS_HOST')[0] != '/') {
- $CONFIG['redis']['port'] = 6379;
- }
-}
diff --git a/22/apache/config/reverse-proxy.config.php b/22/apache/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000
--- a/22/apache/config/reverse-proxy.config.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$overwriteHost = getenv('OVERWRITEHOST');
-if ($overwriteHost) {
- $CONFIG['overwritehost'] = $overwriteHost;
-}
-
-$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteProtocol) {
- $CONFIG['overwriteprotocol'] = $overwriteProtocol;
-}
-
-$overwriteCliUrl = getenv('OVERWRITECLIURL');
-if ($overwriteCliUrl) {
- $CONFIG['overwrite.cli.url'] = $overwriteCliUrl;
-}
-
-$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
-if ($overwriteWebRoot) {
- $CONFIG['overwritewebroot'] = $overwriteWebRoot;
-}
-
-$overwriteCondAddr = getenv('OVERWRITECONDADDR');
-if ($overwriteCondAddr) {
- $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
-}
-
-$trustedProxies = getenv('TRUSTED_PROXIES');
-if ($trustedProxies) {
- $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
-}
diff --git a/22/apache/config/s3.config.php b/22/apache/config/s3.config.php
deleted file mode 100644
index aa3f4f5..0000000
--- a/22/apache/config/s3.config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_S3_BUCKET')) {
- $use_ssl = getenv('OBJECTSTORE_S3_SSL');
- $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
- $use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
- $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => array(
- 'class' => '\OC\Files\ObjectStore\S3',
- 'arguments' => array(
- 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
- 'key' => getenv('OBJECTSTORE_S3_KEY') ?: '',
- 'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '',
- 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '',
- 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '',
- 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
- 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
- // 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'
- )
- )
- );
-}
diff --git a/22/apache/config/smtp.config.php b/22/apache/config/smtp.config.php
deleted file mode 100644
index 62880e4..0000000
--- a/22/apache/config/smtp.config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
- $CONFIG = array (
- 'mail_smtpmode' => 'smtp',
- 'mail_smtphost' => getenv('SMTP_HOST'),
- 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
- 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
- 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'),
- 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
- 'mail_smtpname' => getenv('SMTP_NAME') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-
- if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
- $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
- } elseif (getenv('SMTP_PASSWORD')) {
- $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
- } else {
- $CONFIG['mail_smtppassword'] = '';
- }
-}
diff --git a/22/apache/config/swift.config.php b/22/apache/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
--- a/22/apache/config/swift.config.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_SWIFT_URL')) {
- $autocreate = getenv('OBJECTSTORE_SWIFT_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => [
- 'class' => 'OC\\Files\\ObjectStore\\Swift',
- 'arguments' => [
- 'autocreate' => $autocreate == true && strtolower($autocreate) !== 'false',
- 'user' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_USER_NAME'),
- 'password' => getenv('OBJECTSTORE_SWIFT_USER_PASSWORD'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_USER_DOMAIN')) ?: 'Default',
- ],
- ],
- 'scope' => [
- 'project' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_PROJECT_NAME'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_PROJECT_DOMAIN')) ?: 'Default',
- ],
- ],
- ],
- 'serviceName' => (getenv('OBJECTSTORE_SWIFT_SERVICE_NAME')) ?: 'swift',
- 'region' => getenv('OBJECTSTORE_SWIFT_REGION'),
- 'url' => getenv('OBJECTSTORE_SWIFT_URL'),
- 'bucket' => getenv('OBJECTSTORE_SWIFT_CONTAINER_NAME'),
- ]
- ]
- );
-}
diff --git a/22/apache/cron.sh b/22/apache/cron.sh
deleted file mode 100755
index 4dfa411..0000000
--- a/22/apache/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/22/apache/entrypoint.sh b/22/apache/entrypoint.sh
deleted file mode 100755
index 7dac0df..0000000
--- a/22/apache/entrypoint.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/sh
-set -eu
-
-# version_greater A B returns whether A > B
-version_greater() {
- [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
-}
-
-# return true if specified directory is empty
-directory_empty() {
- [ -z "$(ls -A "$1/")" ]
-}
-
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p www-data -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
-# usage: file_env VAR [DEFAULT]
-# ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
- local var="$1"
- local fileVar="${var}_FILE"
- local def="${2:-}"
- local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
- local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
- if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
- echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
- exit 1
- fi
- if [ -n "${varValue}" ]; then
- export "$var"="${varValue}"
- elif [ -n "${fileVarValue}" ]; then
- export "$var"="$(cat "${fileVarValue}")"
- elif [ -n "${def}" ]; then
- export "$var"="$def"
- fi
- unset "$fileVar"
-}
-
-if expr "$1" : "apache" 1>/dev/null; then
- if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
- a2disconf remoteip
- fi
-fi
-
-if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
- if [ -n "${REDIS_HOST+x}" ]; then
-
- echo "Configuring Redis as session handler"
- {
- file_env REDIS_HOST_PASSWORD
- echo 'session.save_handler = redis'
- # check if redis host is an unix socket path
- if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
- if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"unix://${REDIS_HOST}\""
- fi
- # check if redis password has been set
- elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
- fi
- echo "redis.session.locking_enabled = 1"
- echo "redis.session.lock_retries = -1"
- # redis.session.lock_wait_time is specified in microseconds.
- # Wait 10ms before retrying the lock rather than the default 2ms.
- echo "redis.session.lock_wait_time = 10000"
- } > /usr/local/etc/php/conf.d/redis-session.ini
- fi
-
- installed_version="0.0.0.0"
- if [ -f /var/www/html/version.php ]; then
- # shellcheck disable=SC2016
- installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
- fi
- # shellcheck disable=SC2016
- image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
-
- if version_greater "$installed_version" "$image_version"; then
- echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?"
- exit 1
- fi
-
- if version_greater "$image_version" "$installed_version"; then
- echo "Initializing nextcloud $image_version ..."
- if [ "$installed_version" != "0.0.0.0" ]; then
- echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
- fi
- if [ "$(id -u)" = 0 ]; then
- rsync_options="-rlDog --chown www-data:root"
- else
- rsync_options="-rlD"
- fi
-
- # If another process is syncing the html folder, wait for
- # it to be done, then escape initalization.
- # You need to define the NEXTCLOUD_INIT_LOCK environment variable
- lock=/var/www/html/nextcloud-init-sync.lock
- count=0
- limit=10
-
- if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
- until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
- do
- count=$((count+1))
- wait=$((count*10))
- echo "Another process is initializing Nextcloud. Waiting $wait seconds..."
- sleep $wait
- done
- if [ "$count" -gt "$limit" ]; then
- echo "Timeout while waiting for an ongoing initialization"
- exit 1
- fi
- echo "The other process is done, assuming complete initialization"
- else
- # Prevent multiple images syncing simultaneously
- touch $lock
- rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
-
- for dir in config data custom_apps themes; do
- if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
- rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
- fi
- done
- rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
-
- # Install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- file_env NEXTCLOUD_ADMIN_PASSWORD
- file_env NEXTCLOUD_ADMIN_USER
-
- if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
- # shellcheck disable=SC2016
- install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- file_env MYSQL_DATABASE
- file_env MYSQL_PASSWORD
- file_env MYSQL_USER
- file_env POSTGRES_DB
- file_env POSTGRES_PASSWORD
- file_env POSTGRES_USER
-
- install=false
- if [ -n "${SQLITE_DATABASE+x}" ]; then
- echo "Installing with SQLite database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database-name "$SQLITE_DATABASE"'
- install=true
- elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
- echo "Installing with MySQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
- install=true
- elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
- echo "Installing with PostgreSQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
- install=true
- fi
-
- if [ "$install" = true ]; then
- echo "Starting nextcloud installation"
- max_retries=10
- try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
- do
- echo "Retrying install..."
- try=$((try+1))
- sleep 10s
- done
- if [ "$try" -gt "$max_retries" ]; then
- echo "Installing of nextcloud failed!"
- exit 1
- fi
- if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
- echo "Setting trusted domains…"
- NC_TRUSTED_DOMAIN_IDX=1
- 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))
- done
- fi
- else
- echo "Please run the web-based installer on first connect!"
- fi
- fi
- # Upgrade
- else
- run_as 'php /var/www/html/occ upgrade'
-
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
- echo "The following apps have been disabled:"
- diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
-
- fi
-
- # Initialization done, reset lock
- rm $lock
- echo "Initializing finished"
- fi
- fi
-
- # Update htaccess after init if requested
- if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
- fi
-
-fi
-
-exec "$@"
diff --git a/22/apache/upgrade.exclude b/22/apache/upgrade.exclude
deleted file mode 100644
index 31ce39a..0000000
--- a/22/apache/upgrade.exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
-/nextcloud-init-sync.lock
diff --git a/22/fpm-alpine/Dockerfile b/22/fpm-alpine/Dockerfile
deleted file mode 100644
index 7172b64..0000000
--- a/22/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,134 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.0-fpm-alpine3.16
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apk add --no-cache \
- rsync \
- ; \
- \
- rm /var/spool/cron/crontabs/root; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
-
-# install the PHP extensions we need
-# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
-RUN set -ex; \
- \
- apk add --no-cache --virtual .build-deps \
- $PHPIZE_DEPS \
- autoconf \
- freetype-dev \
- icu-dev \
- libevent-dev \
- libjpeg-turbo-dev \
- libmcrypt-dev \
- libpng-dev \
- libmemcached-dev \
- libxml2-dev \
- libzip-dev \
- openldap-dev \
- pcre-dev \
- postgresql-dev \
- imagemagick-dev \
- libwebp-dev \
- gmp-dev \
- ; \
- \
- docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
- docker-php-ext-configure ldap; \
- docker-php-ext-install -j "$(nproc)" \
- bcmath \
- exif \
- gd \
- intl \
- ldap \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- zip \
- gmp \
- ; \
- \
-# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.21; \
- pecl install memcached-3.2.0; \
- pecl install redis-5.3.7; \
- pecl install imagick-3.7.0; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- rm -r /tmp/pear; \
- \
- runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
- | tr ',' '\n' \
- | sort -u \
- | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
- )"; \
- apk add --virtual .nextcloud-phpext-rundeps $runDeps; \
- apk del .build-deps
-
-# set recommended PHP.ini settings
-# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=16'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=60'; \
- } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
- \
- echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
- \
- { \
- echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
- echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
- echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
- } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-
-ENV NEXTCLOUD_VERSION 22.2.10
-
-RUN set -ex; \
- apk add --no-cache --virtual .fetch-deps \
- bzip2 \
- gnupg \
- ; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- gpgconf --kill all; \
- rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
- mkdir -p /usr/src/nextcloud/data; \
- mkdir -p /usr/src/nextcloud/custom_apps; \
- chmod +x /usr/src/nextcloud/occ; \
- apk del .fetch-deps
-
-COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
diff --git a/22/fpm-alpine/config/apcu.config.php b/22/fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
--- a/22/fpm-alpine/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/22/fpm-alpine/config/apps.config.php b/22/fpm-alpine/config/apps.config.php
deleted file mode 100644
index 4c37f72..0000000
--- a/22/fpm-alpine/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
- 'apps_paths' => array (
- 0 => array (
- 'path' => OC::$SERVERROOT.'/apps',
- 'url' => '/apps',
- 'writable' => false,
- ),
- 1 => array (
- 'path' => OC::$SERVERROOT.'/custom_apps',
- 'url' => '/custom_apps',
- 'writable' => true,
- ),
- ),
-);
diff --git a/22/fpm-alpine/config/autoconfig.php b/22/fpm-alpine/config/autoconfig.php
deleted file mode 100644
index 92ad2a1..0000000
--- a/22/fpm-alpine/config/autoconfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-$autoconfig_enabled = false;
-
-if (getenv('SQLITE_DATABASE')) {
- $AUTOCONFIG['dbtype'] = 'sqlite';
- $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE_FILE') && getenv('MYSQL_USER_FILE') && getenv('MYSQL_PASSWORD_FILE') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('MYSQL_DATABASE_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('MYSQL_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('MYSQL_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
- $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
- $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB_FILE') && getenv('POSTGRES_USER_FILE') && getenv('POSTGRES_PASSWORD_FILE') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('POSTGRES_DB_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('POSTGRES_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('POSTGRES_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
- $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
- $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-}
-
-if ($autoconfig_enabled) {
- $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
-}
diff --git a/22/fpm-alpine/config/redis.config.php b/22/fpm-alpine/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
--- a/22/fpm-alpine/config/redis.config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-if (getenv('REDIS_HOST')) {
- $CONFIG = array(
- 'memcache.distributed' => '\OC\Memcache\Redis',
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => getenv('REDIS_HOST'),
- 'password' => (string) getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-
- if (getenv('REDIS_HOST_PORT') !== false) {
- $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
- } elseif (getenv('REDIS_HOST')[0] != '/') {
- $CONFIG['redis']['port'] = 6379;
- }
-}
diff --git a/22/fpm-alpine/config/reverse-proxy.config.php b/22/fpm-alpine/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000
--- a/22/fpm-alpine/config/reverse-proxy.config.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$overwriteHost = getenv('OVERWRITEHOST');
-if ($overwriteHost) {
- $CONFIG['overwritehost'] = $overwriteHost;
-}
-
-$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteProtocol) {
- $CONFIG['overwriteprotocol'] = $overwriteProtocol;
-}
-
-$overwriteCliUrl = getenv('OVERWRITECLIURL');
-if ($overwriteCliUrl) {
- $CONFIG['overwrite.cli.url'] = $overwriteCliUrl;
-}
-
-$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
-if ($overwriteWebRoot) {
- $CONFIG['overwritewebroot'] = $overwriteWebRoot;
-}
-
-$overwriteCondAddr = getenv('OVERWRITECONDADDR');
-if ($overwriteCondAddr) {
- $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
-}
-
-$trustedProxies = getenv('TRUSTED_PROXIES');
-if ($trustedProxies) {
- $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
-}
diff --git a/22/fpm-alpine/config/s3.config.php b/22/fpm-alpine/config/s3.config.php
deleted file mode 100644
index aa3f4f5..0000000
--- a/22/fpm-alpine/config/s3.config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_S3_BUCKET')) {
- $use_ssl = getenv('OBJECTSTORE_S3_SSL');
- $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
- $use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
- $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => array(
- 'class' => '\OC\Files\ObjectStore\S3',
- 'arguments' => array(
- 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
- 'key' => getenv('OBJECTSTORE_S3_KEY') ?: '',
- 'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '',
- 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '',
- 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '',
- 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
- 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
- // 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'
- )
- )
- );
-}
diff --git a/22/fpm-alpine/config/smtp.config.php b/22/fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 62880e4..0000000
--- a/22/fpm-alpine/config/smtp.config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
- $CONFIG = array (
- 'mail_smtpmode' => 'smtp',
- 'mail_smtphost' => getenv('SMTP_HOST'),
- 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
- 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
- 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'),
- 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
- 'mail_smtpname' => getenv('SMTP_NAME') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-
- if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
- $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
- } elseif (getenv('SMTP_PASSWORD')) {
- $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
- } else {
- $CONFIG['mail_smtppassword'] = '';
- }
-}
diff --git a/22/fpm-alpine/config/swift.config.php b/22/fpm-alpine/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
--- a/22/fpm-alpine/config/swift.config.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_SWIFT_URL')) {
- $autocreate = getenv('OBJECTSTORE_SWIFT_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => [
- 'class' => 'OC\\Files\\ObjectStore\\Swift',
- 'arguments' => [
- 'autocreate' => $autocreate == true && strtolower($autocreate) !== 'false',
- 'user' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_USER_NAME'),
- 'password' => getenv('OBJECTSTORE_SWIFT_USER_PASSWORD'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_USER_DOMAIN')) ?: 'Default',
- ],
- ],
- 'scope' => [
- 'project' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_PROJECT_NAME'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_PROJECT_DOMAIN')) ?: 'Default',
- ],
- ],
- ],
- 'serviceName' => (getenv('OBJECTSTORE_SWIFT_SERVICE_NAME')) ?: 'swift',
- 'region' => getenv('OBJECTSTORE_SWIFT_REGION'),
- 'url' => getenv('OBJECTSTORE_SWIFT_URL'),
- 'bucket' => getenv('OBJECTSTORE_SWIFT_CONTAINER_NAME'),
- ]
- ]
- );
-}
diff --git a/22/fpm-alpine/cron.sh b/22/fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa411..0000000
--- a/22/fpm-alpine/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/22/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh
deleted file mode 100755
index 7dac0df..0000000
--- a/22/fpm-alpine/entrypoint.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/sh
-set -eu
-
-# version_greater A B returns whether A > B
-version_greater() {
- [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
-}
-
-# return true if specified directory is empty
-directory_empty() {
- [ -z "$(ls -A "$1/")" ]
-}
-
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p www-data -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
-# usage: file_env VAR [DEFAULT]
-# ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
- local var="$1"
- local fileVar="${var}_FILE"
- local def="${2:-}"
- local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
- local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
- if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
- echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
- exit 1
- fi
- if [ -n "${varValue}" ]; then
- export "$var"="${varValue}"
- elif [ -n "${fileVarValue}" ]; then
- export "$var"="$(cat "${fileVarValue}")"
- elif [ -n "${def}" ]; then
- export "$var"="$def"
- fi
- unset "$fileVar"
-}
-
-if expr "$1" : "apache" 1>/dev/null; then
- if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
- a2disconf remoteip
- fi
-fi
-
-if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
- if [ -n "${REDIS_HOST+x}" ]; then
-
- echo "Configuring Redis as session handler"
- {
- file_env REDIS_HOST_PASSWORD
- echo 'session.save_handler = redis'
- # check if redis host is an unix socket path
- if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
- if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"unix://${REDIS_HOST}\""
- fi
- # check if redis password has been set
- elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
- fi
- echo "redis.session.locking_enabled = 1"
- echo "redis.session.lock_retries = -1"
- # redis.session.lock_wait_time is specified in microseconds.
- # Wait 10ms before retrying the lock rather than the default 2ms.
- echo "redis.session.lock_wait_time = 10000"
- } > /usr/local/etc/php/conf.d/redis-session.ini
- fi
-
- installed_version="0.0.0.0"
- if [ -f /var/www/html/version.php ]; then
- # shellcheck disable=SC2016
- installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
- fi
- # shellcheck disable=SC2016
- image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
-
- if version_greater "$installed_version" "$image_version"; then
- echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?"
- exit 1
- fi
-
- if version_greater "$image_version" "$installed_version"; then
- echo "Initializing nextcloud $image_version ..."
- if [ "$installed_version" != "0.0.0.0" ]; then
- echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
- fi
- if [ "$(id -u)" = 0 ]; then
- rsync_options="-rlDog --chown www-data:root"
- else
- rsync_options="-rlD"
- fi
-
- # If another process is syncing the html folder, wait for
- # it to be done, then escape initalization.
- # You need to define the NEXTCLOUD_INIT_LOCK environment variable
- lock=/var/www/html/nextcloud-init-sync.lock
- count=0
- limit=10
-
- if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
- until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
- do
- count=$((count+1))
- wait=$((count*10))
- echo "Another process is initializing Nextcloud. Waiting $wait seconds..."
- sleep $wait
- done
- if [ "$count" -gt "$limit" ]; then
- echo "Timeout while waiting for an ongoing initialization"
- exit 1
- fi
- echo "The other process is done, assuming complete initialization"
- else
- # Prevent multiple images syncing simultaneously
- touch $lock
- rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
-
- for dir in config data custom_apps themes; do
- if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
- rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
- fi
- done
- rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
-
- # Install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- file_env NEXTCLOUD_ADMIN_PASSWORD
- file_env NEXTCLOUD_ADMIN_USER
-
- if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
- # shellcheck disable=SC2016
- install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- file_env MYSQL_DATABASE
- file_env MYSQL_PASSWORD
- file_env MYSQL_USER
- file_env POSTGRES_DB
- file_env POSTGRES_PASSWORD
- file_env POSTGRES_USER
-
- install=false
- if [ -n "${SQLITE_DATABASE+x}" ]; then
- echo "Installing with SQLite database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database-name "$SQLITE_DATABASE"'
- install=true
- elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
- echo "Installing with MySQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
- install=true
- elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
- echo "Installing with PostgreSQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
- install=true
- fi
-
- if [ "$install" = true ]; then
- echo "Starting nextcloud installation"
- max_retries=10
- try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
- do
- echo "Retrying install..."
- try=$((try+1))
- sleep 10s
- done
- if [ "$try" -gt "$max_retries" ]; then
- echo "Installing of nextcloud failed!"
- exit 1
- fi
- if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
- echo "Setting trusted domains…"
- NC_TRUSTED_DOMAIN_IDX=1
- 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))
- done
- fi
- else
- echo "Please run the web-based installer on first connect!"
- fi
- fi
- # Upgrade
- else
- run_as 'php /var/www/html/occ upgrade'
-
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
- echo "The following apps have been disabled:"
- diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
-
- fi
-
- # Initialization done, reset lock
- rm $lock
- echo "Initializing finished"
- fi
- fi
-
- # Update htaccess after init if requested
- if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
- fi
-
-fi
-
-exec "$@"
diff --git a/22/fpm-alpine/upgrade.exclude b/22/fpm-alpine/upgrade.exclude
deleted file mode 100644
index 31ce39a..0000000
--- a/22/fpm-alpine/upgrade.exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
-/nextcloud-init-sync.lock
diff --git a/22/fpm/Dockerfile b/22/fpm/Dockerfile
deleted file mode 100644
index 9d5086e..0000000
--- a/22/fpm/Dockerfile
+++ /dev/null
@@ -1,150 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.0-fpm-bullseye
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- libldap-common \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
-
-# install the PHP extensions we need
-# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
-ENV PHP_MEMORY_LIMIT 512M
-ENV PHP_UPLOAD_LIMIT 512M
-RUN set -ex; \
- \
- savedAptMark="$(apt-mark showmanual)"; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- libcurl4-openssl-dev \
- libevent-dev \
- libfreetype6-dev \
- libicu-dev \
- libjpeg-dev \
- libldap2-dev \
- libmcrypt-dev \
- libmemcached-dev \
- libpng-dev \
- libpq-dev \
- libxml2-dev \
- libmagickwand-dev \
- libzip-dev \
- libwebp-dev \
- libgmp-dev \
- ; \
- \
- debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- 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 \
- gd \
- intl \
- ldap \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- zip \
- gmp \
- ; \
- \
-# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.21; \
- pecl install memcached-3.2.0; \
- pecl install redis-5.3.7; \
- pecl install imagick-3.7.0; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- rm -r /tmp/pear; \
- \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
- apt-mark auto '.*' > /dev/null; \
- apt-mark manual $savedAptMark; \
- ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
- | awk '/=>/ { print $3 }' \
- | sort -u \
- | xargs -r dpkg-query -S \
- | cut -d: -f1 \
- | sort -u \
- | xargs -rt apt-mark manual; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=16'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=60'; \
- } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
- \
- echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
- \
- { \
- echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
- echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
- echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
- } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-
-ENV NEXTCLOUD_VERSION 22.2.10
-
-RUN set -ex; \
- fetchDeps=" \
- gnupg \
- dirmngr \
- "; \
- apt-get update; \
- apt-get install -y --no-install-recommends $fetchDeps; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- gpgconf --kill all; \
- rm nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
- mkdir -p /usr/src/nextcloud/data; \
- mkdir -p /usr/src/nextcloud/custom_apps; \
- chmod +x /usr/src/nextcloud/occ; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
- rm -rf /var/lib/apt/lists/*
-
-COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
diff --git a/22/fpm/config/apcu.config.php b/22/fpm/config/apcu.config.php
deleted file mode 100644
index 69fed87..0000000
--- a/22/fpm/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/22/fpm/config/apps.config.php b/22/fpm/config/apps.config.php
deleted file mode 100644
index 4c37f72..0000000
--- a/22/fpm/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
- 'apps_paths' => array (
- 0 => array (
- 'path' => OC::$SERVERROOT.'/apps',
- 'url' => '/apps',
- 'writable' => false,
- ),
- 1 => array (
- 'path' => OC::$SERVERROOT.'/custom_apps',
- 'url' => '/custom_apps',
- 'writable' => true,
- ),
- ),
-);
diff --git a/22/fpm/config/autoconfig.php b/22/fpm/config/autoconfig.php
deleted file mode 100644
index 92ad2a1..0000000
--- a/22/fpm/config/autoconfig.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-$autoconfig_enabled = false;
-
-if (getenv('SQLITE_DATABASE')) {
- $AUTOCONFIG['dbtype'] = 'sqlite';
- $AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE_FILE') && getenv('MYSQL_USER_FILE') && getenv('MYSQL_PASSWORD_FILE') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('MYSQL_DATABASE_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('MYSQL_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('MYSQL_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG['dbtype'] = 'mysql';
- $AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
- $AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
- $AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB_FILE') && getenv('POSTGRES_USER_FILE') && getenv('POSTGRES_PASSWORD_FILE') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('POSTGRES_DB_FILE')));
- $AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('POSTGRES_USER_FILE')));
- $AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('POSTGRES_PASSWORD_FILE')));
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG['dbtype'] = 'pgsql';
- $AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');
- $AUTOCONFIG['dbuser'] = getenv('POSTGRES_USER');
- $AUTOCONFIG['dbpass'] = getenv('POSTGRES_PASSWORD');
- $AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-}
-
-if ($autoconfig_enabled) {
- $AUTOCONFIG['directory'] = getenv('NEXTCLOUD_DATA_DIR') ?: '/var/www/html/data';
-}
diff --git a/22/fpm/config/redis.config.php b/22/fpm/config/redis.config.php
deleted file mode 100644
index a5fde3c..0000000
--- a/22/fpm/config/redis.config.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-if (getenv('REDIS_HOST')) {
- $CONFIG = array(
- 'memcache.distributed' => '\OC\Memcache\Redis',
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => getenv('REDIS_HOST'),
- 'password' => (string) getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-
- if (getenv('REDIS_HOST_PORT') !== false) {
- $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
- } elseif (getenv('REDIS_HOST')[0] != '/') {
- $CONFIG['redis']['port'] = 6379;
- }
-}
diff --git a/22/fpm/config/reverse-proxy.config.php b/22/fpm/config/reverse-proxy.config.php
deleted file mode 100644
index 7df0415..0000000
--- a/22/fpm/config/reverse-proxy.config.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$overwriteHost = getenv('OVERWRITEHOST');
-if ($overwriteHost) {
- $CONFIG['overwritehost'] = $overwriteHost;
-}
-
-$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
-if ($overwriteProtocol) {
- $CONFIG['overwriteprotocol'] = $overwriteProtocol;
-}
-
-$overwriteCliUrl = getenv('OVERWRITECLIURL');
-if ($overwriteCliUrl) {
- $CONFIG['overwrite.cli.url'] = $overwriteCliUrl;
-}
-
-$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
-if ($overwriteWebRoot) {
- $CONFIG['overwritewebroot'] = $overwriteWebRoot;
-}
-
-$overwriteCondAddr = getenv('OVERWRITECONDADDR');
-if ($overwriteCondAddr) {
- $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
-}
-
-$trustedProxies = getenv('TRUSTED_PROXIES');
-if ($trustedProxies) {
- $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
-}
diff --git a/22/fpm/config/s3.config.php b/22/fpm/config/s3.config.php
deleted file mode 100644
index aa3f4f5..0000000
--- a/22/fpm/config/s3.config.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_S3_BUCKET')) {
- $use_ssl = getenv('OBJECTSTORE_S3_SSL');
- $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
- $use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
- $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => array(
- 'class' => '\OC\Files\ObjectStore\S3',
- 'arguments' => array(
- 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
- 'key' => getenv('OBJECTSTORE_S3_KEY') ?: '',
- 'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '',
- 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '',
- 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '',
- 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
- 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
- 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
- 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
- // 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'
- )
- )
- );
-}
diff --git a/22/fpm/config/smtp.config.php b/22/fpm/config/smtp.config.php
deleted file mode 100644
index 62880e4..0000000
--- a/22/fpm/config/smtp.config.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
- $CONFIG = array (
- 'mail_smtpmode' => 'smtp',
- 'mail_smtphost' => getenv('SMTP_HOST'),
- 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
- 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
- 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'),
- 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
- 'mail_smtpname' => getenv('SMTP_NAME') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-
- if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
- $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
- } elseif (getenv('SMTP_PASSWORD')) {
- $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
- } else {
- $CONFIG['mail_smtppassword'] = '';
- }
-}
diff --git a/22/fpm/config/swift.config.php b/22/fpm/config/swift.config.php
deleted file mode 100644
index 47ada56..0000000
--- a/22/fpm/config/swift.config.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-if (getenv('OBJECTSTORE_SWIFT_URL')) {
- $autocreate = getenv('OBJECTSTORE_SWIFT_AUTOCREATE');
- $CONFIG = array(
- 'objectstore' => [
- 'class' => 'OC\\Files\\ObjectStore\\Swift',
- 'arguments' => [
- 'autocreate' => $autocreate == true && strtolower($autocreate) !== 'false',
- 'user' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_USER_NAME'),
- 'password' => getenv('OBJECTSTORE_SWIFT_USER_PASSWORD'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_USER_DOMAIN')) ?: 'Default',
- ],
- ],
- 'scope' => [
- 'project' => [
- 'name' => getenv('OBJECTSTORE_SWIFT_PROJECT_NAME'),
- 'domain' => [
- 'name' => (getenv('OBJECTSTORE_SWIFT_PROJECT_DOMAIN')) ?: 'Default',
- ],
- ],
- ],
- 'serviceName' => (getenv('OBJECTSTORE_SWIFT_SERVICE_NAME')) ?: 'swift',
- 'region' => getenv('OBJECTSTORE_SWIFT_REGION'),
- 'url' => getenv('OBJECTSTORE_SWIFT_URL'),
- 'bucket' => getenv('OBJECTSTORE_SWIFT_CONTAINER_NAME'),
- ]
- ]
- );
-}
diff --git a/22/fpm/cron.sh b/22/fpm/cron.sh
deleted file mode 100755
index 4dfa411..0000000
--- a/22/fpm/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/22/fpm/entrypoint.sh b/22/fpm/entrypoint.sh
deleted file mode 100755
index 7dac0df..0000000
--- a/22/fpm/entrypoint.sh
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/sh
-set -eu
-
-# version_greater A B returns whether A > B
-version_greater() {
- [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
-}
-
-# return true if specified directory is empty
-directory_empty() {
- [ -z "$(ls -A "$1/")" ]
-}
-
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p www-data -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
-# usage: file_env VAR [DEFAULT]
-# ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
- local var="$1"
- local fileVar="${var}_FILE"
- local def="${2:-}"
- local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
- local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
- if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
- echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
- exit 1
- fi
- if [ -n "${varValue}" ]; then
- export "$var"="${varValue}"
- elif [ -n "${fileVarValue}" ]; then
- export "$var"="$(cat "${fileVarValue}")"
- elif [ -n "${def}" ]; then
- export "$var"="$def"
- fi
- unset "$fileVar"
-}
-
-if expr "$1" : "apache" 1>/dev/null; then
- if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
- a2disconf remoteip
- fi
-fi
-
-if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
- if [ -n "${REDIS_HOST+x}" ]; then
-
- echo "Configuring Redis as session handler"
- {
- file_env REDIS_HOST_PASSWORD
- echo 'session.save_handler = redis'
- # check if redis host is an unix socket path
- if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
- if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"unix://${REDIS_HOST}\""
- fi
- # check if redis password has been set
- elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
- else
- echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
- fi
- echo "redis.session.locking_enabled = 1"
- echo "redis.session.lock_retries = -1"
- # redis.session.lock_wait_time is specified in microseconds.
- # Wait 10ms before retrying the lock rather than the default 2ms.
- echo "redis.session.lock_wait_time = 10000"
- } > /usr/local/etc/php/conf.d/redis-session.ini
- fi
-
- installed_version="0.0.0.0"
- if [ -f /var/www/html/version.php ]; then
- # shellcheck disable=SC2016
- installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
- fi
- # shellcheck disable=SC2016
- image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
-
- if version_greater "$installed_version" "$image_version"; then
- echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?"
- exit 1
- fi
-
- if version_greater "$image_version" "$installed_version"; then
- echo "Initializing nextcloud $image_version ..."
- if [ "$installed_version" != "0.0.0.0" ]; then
- echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
- fi
- if [ "$(id -u)" = 0 ]; then
- rsync_options="-rlDog --chown www-data:root"
- else
- rsync_options="-rlD"
- fi
-
- # If another process is syncing the html folder, wait for
- # it to be done, then escape initalization.
- # You need to define the NEXTCLOUD_INIT_LOCK environment variable
- lock=/var/www/html/nextcloud-init-sync.lock
- count=0
- limit=10
-
- if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
- until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
- do
- count=$((count+1))
- wait=$((count*10))
- echo "Another process is initializing Nextcloud. Waiting $wait seconds..."
- sleep $wait
- done
- if [ "$count" -gt "$limit" ]; then
- echo "Timeout while waiting for an ongoing initialization"
- exit 1
- fi
- echo "The other process is done, assuming complete initialization"
- else
- # Prevent multiple images syncing simultaneously
- touch $lock
- rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
-
- for dir in config data custom_apps themes; do
- if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
- rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
- fi
- done
- rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
-
- # Install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- file_env NEXTCLOUD_ADMIN_PASSWORD
- file_env NEXTCLOUD_ADMIN_USER
-
- if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
- # shellcheck disable=SC2016
- install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- file_env MYSQL_DATABASE
- file_env MYSQL_PASSWORD
- file_env MYSQL_USER
- file_env POSTGRES_DB
- file_env POSTGRES_PASSWORD
- file_env POSTGRES_USER
-
- install=false
- if [ -n "${SQLITE_DATABASE+x}" ]; then
- echo "Installing with SQLite database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database-name "$SQLITE_DATABASE"'
- install=true
- elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
- echo "Installing with MySQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
- install=true
- elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
- echo "Installing with PostgreSQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
- install=true
- fi
-
- if [ "$install" = true ]; then
- echo "Starting nextcloud installation"
- max_retries=10
- try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
- do
- echo "Retrying install..."
- try=$((try+1))
- sleep 10s
- done
- if [ "$try" -gt "$max_retries" ]; then
- echo "Installing of nextcloud failed!"
- exit 1
- fi
- if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
- echo "Setting trusted domains…"
- NC_TRUSTED_DOMAIN_IDX=1
- 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))
- done
- fi
- else
- echo "Please run the web-based installer on first connect!"
- fi
- fi
- # Upgrade
- else
- run_as 'php /var/www/html/occ upgrade'
-
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
- echo "The following apps have been disabled:"
- diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
-
- fi
-
- # Initialization done, reset lock
- rm $lock
- echo "Initializing finished"
- fi
- fi
-
- # Update htaccess after init if requested
- if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
- fi
-
-fi
-
-exec "$@"
diff --git a/22/fpm/upgrade.exclude b/22/fpm/upgrade.exclude
deleted file mode 100644
index 31ce39a..0000000
--- a/22/fpm/upgrade.exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
-/nextcloud-init-sync.lock