From 149daa299df22713c26e383daf9ffd1f28d94ecb Mon Sep 17 00:00:00 2001
From: tilosp-bot <git-bot@tilosp.de>
Date: Thu, 7 Nov 2019 14:03:01 +0000
Subject: [PATCH 1/2] Run update.sh
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
---
.travis.yml | 6 -
17.0-rc/apache/Dockerfile | 151 ------------------
.../config/apache-pretty-urls.config.php | 4 -
17.0-rc/apache/config/apcu.config.php | 4 -
17.0-rc/apache/config/apps.config.php | 15 --
17.0-rc/apache/config/autoconfig.php | 31 ----
17.0-rc/apache/config/redis.config.php | 13 --
17.0-rc/apache/config/smtp.config.php | 15 --
17.0-rc/apache/cron.sh | 4 -
17.0-rc/apache/entrypoint.sh | 145 -----------------
17.0-rc/apache/upgrade.exclude | 5 -
17.0-rc/fpm-alpine/Dockerfile | 126 ---------------
17.0-rc/fpm-alpine/config/apcu.config.php | 4 -
17.0-rc/fpm-alpine/config/apps.config.php | 15 --
17.0-rc/fpm-alpine/config/autoconfig.php | 31 ----
17.0-rc/fpm-alpine/config/redis.config.php | 13 --
17.0-rc/fpm-alpine/config/smtp.config.php | 15 --
17.0-rc/fpm-alpine/cron.sh | 4 -
17.0-rc/fpm-alpine/entrypoint.sh | 145 -----------------
17.0-rc/fpm-alpine/upgrade.exclude | 5 -
17.0-rc/fpm/Dockerfile | 143 -----------------
17.0-rc/fpm/config/apcu.config.php | 4 -
17.0-rc/fpm/config/apps.config.php | 15 --
17.0-rc/fpm/config/autoconfig.php | 31 ----
17.0-rc/fpm/config/redis.config.php | 13 --
17.0-rc/fpm/config/smtp.config.php | 15 --
17.0-rc/fpm/cron.sh | 4 -
17.0-rc/fpm/entrypoint.sh | 145 -----------------
17.0-rc/fpm/upgrade.exclude | 5 -
17.0/apache/Dockerfile | 2 +-
17.0/fpm-alpine/Dockerfile | 2 +-
17.0/fpm/Dockerfile | 2 +-
32 files changed, 3 insertions(+), 1129 deletions(-)
delete mode 100644 17.0-rc/apache/Dockerfile
delete mode 100644 17.0-rc/apache/config/apache-pretty-urls.config.php
delete mode 100644 17.0-rc/apache/config/apcu.config.php
delete mode 100644 17.0-rc/apache/config/apps.config.php
delete mode 100644 17.0-rc/apache/config/autoconfig.php
delete mode 100644 17.0-rc/apache/config/redis.config.php
delete mode 100644 17.0-rc/apache/config/smtp.config.php
delete mode 100755 17.0-rc/apache/cron.sh
delete mode 100755 17.0-rc/apache/entrypoint.sh
delete mode 100644 17.0-rc/apache/upgrade.exclude
delete mode 100644 17.0-rc/fpm-alpine/Dockerfile
delete mode 100644 17.0-rc/fpm-alpine/config/apcu.config.php
delete mode 100644 17.0-rc/fpm-alpine/config/apps.config.php
delete mode 100644 17.0-rc/fpm-alpine/config/autoconfig.php
delete mode 100644 17.0-rc/fpm-alpine/config/redis.config.php
delete mode 100644 17.0-rc/fpm-alpine/config/smtp.config.php
delete mode 100755 17.0-rc/fpm-alpine/cron.sh
delete mode 100755 17.0-rc/fpm-alpine/entrypoint.sh
delete mode 100644 17.0-rc/fpm-alpine/upgrade.exclude
delete mode 100644 17.0-rc/fpm/Dockerfile
delete mode 100644 17.0-rc/fpm/config/apcu.config.php
delete mode 100644 17.0-rc/fpm/config/apps.config.php
delete mode 100644 17.0-rc/fpm/config/autoconfig.php
delete mode 100644 17.0-rc/fpm/config/redis.config.php
delete mode 100644 17.0-rc/fpm/config/smtp.config.php
delete mode 100755 17.0-rc/fpm/cron.sh
delete mode 100755 17.0-rc/fpm/entrypoint.sh
delete mode 100644 17.0-rc/fpm/upgrade.exclude
diff --git a/.travis.yml b/.travis.yml
index 23e3d026..88a0c038 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,12 +76,6 @@ jobs:
- env: VERSION=16.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=16.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=16.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=17.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=17.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=17.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=17.0-rc VARIANT=apache ARCH=i386
- env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=15.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=15.0 VARIANT=fpm ARCH=amd64
diff --git a/17.0-rc/apache/Dockerfile b/17.0-rc/apache/Dockerfile
deleted file mode 100644
index e0929171..00000000
--- a/17.0-rc/apache/Dockerfile
+++ /dev/null
@@ -1,151 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- 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
-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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod 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 17.0.1RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/17.0-rc/apache/config/apache-pretty-urls.config.php b/17.0-rc/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c..00000000
--- a/17.0-rc/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/17.0-rc/apache/config/apcu.config.php b/17.0-rc/apache/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/17.0-rc/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/17.0-rc/apache/config/apps.config.php b/17.0-rc/apache/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/17.0-rc/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/17.0-rc/apache/config/autoconfig.php b/17.0-rc/apache/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/17.0-rc/apache/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/17.0-rc/apache/config/redis.config.php b/17.0-rc/apache/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/17.0-rc/apache/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/17.0-rc/apache/config/smtp.config.php b/17.0-rc/apache/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/17.0-rc/apache/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/17.0-rc/apache/cron.sh b/17.0-rc/apache/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/17.0-rc/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/17.0-rc/apache/entrypoint.sh b/17.0-rc/apache/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/17.0-rc/apache/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/17.0-rc/apache/upgrade.exclude b/17.0-rc/apache/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/17.0-rc/apache/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/17.0-rc/fpm-alpine/Dockerfile b/17.0-rc/fpm-alpine/Dockerfile
deleted file mode 100644
index b6f1b41a..00000000
--- a/17.0-rc/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,126 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.10
-
-# 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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure ldap; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
- 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 17.0.1RC1
-
-RUN set -ex; \
- apk add --no-cache --virtual .fetch-deps \
- bzip2 \
- gnupg \
- ; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/17.0-rc/fpm-alpine/config/apcu.config.php b/17.0-rc/fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/17.0-rc/fpm-alpine/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/17.0-rc/fpm-alpine/config/apps.config.php b/17.0-rc/fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/17.0-rc/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/17.0-rc/fpm-alpine/config/autoconfig.php b/17.0-rc/fpm-alpine/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/17.0-rc/fpm-alpine/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/17.0-rc/fpm-alpine/config/redis.config.php b/17.0-rc/fpm-alpine/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/17.0-rc/fpm-alpine/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/17.0-rc/fpm-alpine/config/smtp.config.php b/17.0-rc/fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/17.0-rc/fpm-alpine/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/17.0-rc/fpm-alpine/cron.sh b/17.0-rc/fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/17.0-rc/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/17.0-rc/fpm-alpine/entrypoint.sh b/17.0-rc/fpm-alpine/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/17.0-rc/fpm-alpine/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/17.0-rc/fpm-alpine/upgrade.exclude b/17.0-rc/fpm-alpine/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/17.0-rc/fpm-alpine/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/17.0-rc/fpm/Dockerfile b/17.0-rc/fpm/Dockerfile
deleted file mode 100644
index 8c41df7d..00000000
--- a/17.0-rc/fpm/Dockerfile
+++ /dev/null
@@ -1,143 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- 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
-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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 17.0.1RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/17.0-rc/fpm/config/apcu.config.php b/17.0-rc/fpm/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/17.0-rc/fpm/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/17.0-rc/fpm/config/apps.config.php b/17.0-rc/fpm/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/17.0-rc/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/17.0-rc/fpm/config/autoconfig.php b/17.0-rc/fpm/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/17.0-rc/fpm/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/17.0-rc/fpm/config/redis.config.php b/17.0-rc/fpm/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/17.0-rc/fpm/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/17.0-rc/fpm/config/smtp.config.php b/17.0-rc/fpm/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/17.0-rc/fpm/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/17.0-rc/fpm/cron.sh b/17.0-rc/fpm/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/17.0-rc/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/17.0-rc/fpm/entrypoint.sh b/17.0-rc/fpm/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/17.0-rc/fpm/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/17.0-rc/fpm/upgrade.exclude b/17.0-rc/fpm/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/17.0-rc/fpm/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/17.0/apache/Dockerfile b/17.0/apache/Dockerfile
index 4dc73dad..acd53038 100644
--- a/17.0/apache/Dockerfile
+++ b/17.0/apache/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 17.0.0
+ENV NEXTCLOUD_VERSION 17.0.1
RUN set -ex; \
fetchDeps=" \
diff --git a/17.0/fpm-alpine/Dockerfile b/17.0/fpm-alpine/Dockerfile
index f91799c1..00353ccb 100644
--- a/17.0/fpm-alpine/Dockerfile
+++ b/17.0/fpm-alpine/Dockerfile
@@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 17.0.0
+ENV NEXTCLOUD_VERSION 17.0.1
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/17.0/fpm/Dockerfile b/17.0/fpm/Dockerfile
index 666ca00f..9f89a4e1 100644
--- a/17.0/fpm/Dockerfile
+++ b/17.0/fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 17.0.0
+ENV NEXTCLOUD_VERSION 17.0.1
RUN set -ex; \
fetchDeps=" \
From fe5b6beaddff62255f246395576942f989a3903b Mon Sep 17 00:00:00 2001
From: tilosp-bot <git-bot@tilosp.de>
Date: Fri, 8 Nov 2019 12:36:03 +0000
Subject: [PATCH 2/2] Run update.sh
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
---
.travis.yml | 14 +-
15.0-rc/apache/Dockerfile | 151 ------------------
.../config/apache-pretty-urls.config.php | 4 -
15.0-rc/apache/config/apcu.config.php | 4 -
15.0-rc/apache/config/apps.config.php | 15 --
15.0-rc/apache/config/autoconfig.php | 31 ----
15.0-rc/apache/config/redis.config.php | 13 --
15.0-rc/apache/config/smtp.config.php | 15 --
15.0-rc/apache/cron.sh | 4 -
15.0-rc/apache/entrypoint.sh | 145 -----------------
15.0-rc/apache/upgrade.exclude | 5 -
15.0-rc/fpm-alpine/Dockerfile | 126 ---------------
15.0-rc/fpm-alpine/config/apcu.config.php | 4 -
15.0-rc/fpm-alpine/config/apps.config.php | 15 --
15.0-rc/fpm-alpine/config/autoconfig.php | 31 ----
15.0-rc/fpm-alpine/config/redis.config.php | 13 --
15.0-rc/fpm-alpine/config/smtp.config.php | 15 --
15.0-rc/fpm-alpine/cron.sh | 4 -
15.0-rc/fpm-alpine/entrypoint.sh | 145 -----------------
15.0-rc/fpm-alpine/upgrade.exclude | 5 -
15.0-rc/fpm/Dockerfile | 143 -----------------
15.0-rc/fpm/config/apcu.config.php | 4 -
15.0-rc/fpm/config/apps.config.php | 15 --
15.0-rc/fpm/config/autoconfig.php | 31 ----
15.0-rc/fpm/config/redis.config.php | 13 --
15.0-rc/fpm/config/smtp.config.php | 15 --
15.0-rc/fpm/cron.sh | 4 -
15.0-rc/fpm/entrypoint.sh | 145 -----------------
15.0-rc/fpm/upgrade.exclude | 5 -
15.0/apache/Dockerfile | 2 +-
15.0/fpm-alpine/Dockerfile | 2 +-
15.0/fpm/Dockerfile | 2 +-
16.0-rc/apache/Dockerfile | 151 ------------------
.../config/apache-pretty-urls.config.php | 4 -
16.0-rc/apache/config/apcu.config.php | 4 -
16.0-rc/apache/config/apps.config.php | 15 --
16.0-rc/apache/config/autoconfig.php | 31 ----
16.0-rc/apache/config/redis.config.php | 13 --
16.0-rc/apache/config/smtp.config.php | 15 --
16.0-rc/apache/cron.sh | 4 -
16.0-rc/apache/entrypoint.sh | 145 -----------------
16.0-rc/apache/upgrade.exclude | 5 -
16.0-rc/fpm-alpine/Dockerfile | 126 ---------------
16.0-rc/fpm-alpine/config/apcu.config.php | 4 -
16.0-rc/fpm-alpine/config/apps.config.php | 15 --
16.0-rc/fpm-alpine/config/autoconfig.php | 31 ----
16.0-rc/fpm-alpine/config/redis.config.php | 13 --
16.0-rc/fpm-alpine/config/smtp.config.php | 15 --
16.0-rc/fpm-alpine/cron.sh | 4 -
16.0-rc/fpm-alpine/entrypoint.sh | 145 -----------------
16.0-rc/fpm-alpine/upgrade.exclude | 5 -
16.0-rc/fpm/Dockerfile | 143 -----------------
16.0-rc/fpm/config/apcu.config.php | 4 -
16.0-rc/fpm/config/apps.config.php | 15 --
16.0-rc/fpm/config/autoconfig.php | 31 ----
16.0-rc/fpm/config/redis.config.php | 13 --
16.0-rc/fpm/config/smtp.config.php | 15 --
16.0-rc/fpm/cron.sh | 4 -
16.0-rc/fpm/entrypoint.sh | 145 -----------------
16.0-rc/fpm/upgrade.exclude | 5 -
16.0/apache/Dockerfile | 2 +-
16.0/fpm-alpine/Dockerfile | 2 +-
16.0/fpm/Dockerfile | 2 +-
63 files changed, 7 insertions(+), 2259 deletions(-)
delete mode 100644 15.0-rc/apache/Dockerfile
delete mode 100644 15.0-rc/apache/config/apache-pretty-urls.config.php
delete mode 100644 15.0-rc/apache/config/apcu.config.php
delete mode 100644 15.0-rc/apache/config/apps.config.php
delete mode 100644 15.0-rc/apache/config/autoconfig.php
delete mode 100644 15.0-rc/apache/config/redis.config.php
delete mode 100644 15.0-rc/apache/config/smtp.config.php
delete mode 100755 15.0-rc/apache/cron.sh
delete mode 100755 15.0-rc/apache/entrypoint.sh
delete mode 100644 15.0-rc/apache/upgrade.exclude
delete mode 100644 15.0-rc/fpm-alpine/Dockerfile
delete mode 100644 15.0-rc/fpm-alpine/config/apcu.config.php
delete mode 100644 15.0-rc/fpm-alpine/config/apps.config.php
delete mode 100644 15.0-rc/fpm-alpine/config/autoconfig.php
delete mode 100644 15.0-rc/fpm-alpine/config/redis.config.php
delete mode 100644 15.0-rc/fpm-alpine/config/smtp.config.php
delete mode 100755 15.0-rc/fpm-alpine/cron.sh
delete mode 100755 15.0-rc/fpm-alpine/entrypoint.sh
delete mode 100644 15.0-rc/fpm-alpine/upgrade.exclude
delete mode 100644 15.0-rc/fpm/Dockerfile
delete mode 100644 15.0-rc/fpm/config/apcu.config.php
delete mode 100644 15.0-rc/fpm/config/apps.config.php
delete mode 100644 15.0-rc/fpm/config/autoconfig.php
delete mode 100644 15.0-rc/fpm/config/redis.config.php
delete mode 100644 15.0-rc/fpm/config/smtp.config.php
delete mode 100755 15.0-rc/fpm/cron.sh
delete mode 100755 15.0-rc/fpm/entrypoint.sh
delete mode 100644 15.0-rc/fpm/upgrade.exclude
delete mode 100644 16.0-rc/apache/Dockerfile
delete mode 100644 16.0-rc/apache/config/apache-pretty-urls.config.php
delete mode 100644 16.0-rc/apache/config/apcu.config.php
delete mode 100644 16.0-rc/apache/config/apps.config.php
delete mode 100644 16.0-rc/apache/config/autoconfig.php
delete mode 100644 16.0-rc/apache/config/redis.config.php
delete mode 100644 16.0-rc/apache/config/smtp.config.php
delete mode 100755 16.0-rc/apache/cron.sh
delete mode 100755 16.0-rc/apache/entrypoint.sh
delete mode 100644 16.0-rc/apache/upgrade.exclude
delete mode 100644 16.0-rc/fpm-alpine/Dockerfile
delete mode 100644 16.0-rc/fpm-alpine/config/apcu.config.php
delete mode 100644 16.0-rc/fpm-alpine/config/apps.config.php
delete mode 100644 16.0-rc/fpm-alpine/config/autoconfig.php
delete mode 100644 16.0-rc/fpm-alpine/config/redis.config.php
delete mode 100644 16.0-rc/fpm-alpine/config/smtp.config.php
delete mode 100755 16.0-rc/fpm-alpine/cron.sh
delete mode 100755 16.0-rc/fpm-alpine/entrypoint.sh
delete mode 100644 16.0-rc/fpm-alpine/upgrade.exclude
delete mode 100644 16.0-rc/fpm/Dockerfile
delete mode 100644 16.0-rc/fpm/config/apcu.config.php
delete mode 100644 16.0-rc/fpm/config/apps.config.php
delete mode 100644 16.0-rc/fpm/config/autoconfig.php
delete mode 100644 16.0-rc/fpm/config/redis.config.php
delete mode 100644 16.0-rc/fpm/config/smtp.config.php
delete mode 100755 16.0-rc/fpm/cron.sh
delete mode 100755 16.0-rc/fpm/entrypoint.sh
delete mode 100644 16.0-rc/fpm/upgrade.exclude
diff --git a/.travis.yml b/.travis.yml
index 88a0c038..c487e6ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,19 +64,7 @@ jobs:
- travis_retry ./generate-stackbrew-library.sh
- stage: test images
- env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=15.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=15.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=15.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=15.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=15.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=16.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=16.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=16.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=16.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64
+ env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=15.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=15.0 VARIANT=fpm ARCH=amd64
- env: VERSION=15.0 VARIANT=fpm ARCH=i386
diff --git a/15.0-rc/apache/Dockerfile b/15.0-rc/apache/Dockerfile
deleted file mode 100644
index 13c502ff..00000000
--- a/15.0-rc/apache/Dockerfile
+++ /dev/null
@@ -1,151 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/15 * * * * 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; \
- \
- 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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod 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 15.0.13RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/15.0-rc/apache/config/apache-pretty-urls.config.php b/15.0-rc/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c..00000000
--- a/15.0-rc/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/15.0-rc/apache/config/apcu.config.php b/15.0-rc/apache/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/15.0-rc/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/15.0-rc/apache/config/apps.config.php b/15.0-rc/apache/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/15.0-rc/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/15.0-rc/apache/config/autoconfig.php b/15.0-rc/apache/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/15.0-rc/apache/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/15.0-rc/apache/config/redis.config.php b/15.0-rc/apache/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/15.0-rc/apache/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/15.0-rc/apache/config/smtp.config.php b/15.0-rc/apache/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/15.0-rc/apache/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/15.0-rc/apache/cron.sh b/15.0-rc/apache/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/15.0-rc/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/15.0-rc/apache/entrypoint.sh b/15.0-rc/apache/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/15.0-rc/apache/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/15.0-rc/apache/upgrade.exclude b/15.0-rc/apache/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/15.0-rc/apache/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/15.0-rc/fpm-alpine/Dockerfile b/15.0-rc/fpm-alpine/Dockerfile
deleted file mode 100644
index 8a8ecacd..00000000
--- a/15.0-rc/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,126 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.10
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apk add --no-cache \
- rsync \
- ; \
- \
- rm /var/spool/cron/crontabs/root; \
- echo '*/15 * * * * 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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure ldap; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
- 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 15.0.13RC1
-
-RUN set -ex; \
- apk add --no-cache --virtual .fetch-deps \
- bzip2 \
- gnupg \
- ; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/15.0-rc/fpm-alpine/config/apcu.config.php b/15.0-rc/fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/15.0-rc/fpm-alpine/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/15.0-rc/fpm-alpine/config/apps.config.php b/15.0-rc/fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/15.0-rc/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/15.0-rc/fpm-alpine/config/autoconfig.php b/15.0-rc/fpm-alpine/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/15.0-rc/fpm-alpine/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/15.0-rc/fpm-alpine/config/redis.config.php b/15.0-rc/fpm-alpine/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/15.0-rc/fpm-alpine/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/15.0-rc/fpm-alpine/config/smtp.config.php b/15.0-rc/fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/15.0-rc/fpm-alpine/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/15.0-rc/fpm-alpine/cron.sh b/15.0-rc/fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/15.0-rc/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/15.0-rc/fpm-alpine/entrypoint.sh b/15.0-rc/fpm-alpine/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/15.0-rc/fpm-alpine/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/15.0-rc/fpm-alpine/upgrade.exclude b/15.0-rc/fpm-alpine/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/15.0-rc/fpm-alpine/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/15.0-rc/fpm/Dockerfile b/15.0-rc/fpm/Dockerfile
deleted file mode 100644
index 1b7fc088..00000000
--- a/15.0-rc/fpm/Dockerfile
+++ /dev/null
@@ -1,143 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/15 * * * * 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; \
- \
- 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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 15.0.13RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/15.0-rc/fpm/config/apcu.config.php b/15.0-rc/fpm/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/15.0-rc/fpm/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/15.0-rc/fpm/config/apps.config.php b/15.0-rc/fpm/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/15.0-rc/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/15.0-rc/fpm/config/autoconfig.php b/15.0-rc/fpm/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/15.0-rc/fpm/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/15.0-rc/fpm/config/redis.config.php b/15.0-rc/fpm/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/15.0-rc/fpm/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/15.0-rc/fpm/config/smtp.config.php b/15.0-rc/fpm/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/15.0-rc/fpm/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/15.0-rc/fpm/cron.sh b/15.0-rc/fpm/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/15.0-rc/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/15.0-rc/fpm/entrypoint.sh b/15.0-rc/fpm/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/15.0-rc/fpm/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/15.0-rc/fpm/upgrade.exclude b/15.0-rc/fpm/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/15.0-rc/fpm/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index 0edef6e0..8566a962 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 15.0.12
+ENV NEXTCLOUD_VERSION 15.0.13
RUN set -ex; \
fetchDeps=" \
diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
index a258a585..405277cd 100644
--- a/15.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.12
+ENV NEXTCLOUD_VERSION 15.0.13
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index 345e3254..107ea1a3 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.12
+ENV NEXTCLOUD_VERSION 15.0.13
RUN set -ex; \
fetchDeps=" \
diff --git a/16.0-rc/apache/Dockerfile b/16.0-rc/apache/Dockerfile
deleted file mode 100644
index b166b558..00000000
--- a/16.0-rc/apache/Dockerfile
+++ /dev/null
@@ -1,151 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-apache-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/15 * * * * 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; \
- \
- 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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod 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 16.0.6RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/16.0-rc/apache/config/apache-pretty-urls.config.php b/16.0-rc/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c..00000000
--- a/16.0-rc/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/16.0-rc/apache/config/apcu.config.php b/16.0-rc/apache/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/16.0-rc/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/16.0-rc/apache/config/apps.config.php b/16.0-rc/apache/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/16.0-rc/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/16.0-rc/apache/config/autoconfig.php b/16.0-rc/apache/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/16.0-rc/apache/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/16.0-rc/apache/config/redis.config.php b/16.0-rc/apache/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/16.0-rc/apache/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/16.0-rc/apache/config/smtp.config.php b/16.0-rc/apache/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/16.0-rc/apache/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/16.0-rc/apache/cron.sh b/16.0-rc/apache/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/16.0-rc/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/16.0-rc/apache/entrypoint.sh b/16.0-rc/apache/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/16.0-rc/apache/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/16.0-rc/apache/upgrade.exclude b/16.0-rc/apache/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/16.0-rc/apache/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/16.0-rc/fpm-alpine/Dockerfile b/16.0-rc/fpm-alpine/Dockerfile
deleted file mode 100644
index 846d432c..00000000
--- a/16.0-rc/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,126 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.10
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apk add --no-cache \
- rsync \
- ; \
- \
- rm /var/spool/cron/crontabs/root; \
- echo '*/15 * * * * 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-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure ldap; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
- 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 16.0.6RC1
-
-RUN set -ex; \
- apk add --no-cache --virtual .fetch-deps \
- bzip2 \
- gnupg \
- ; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/16.0-rc/fpm-alpine/config/apcu.config.php b/16.0-rc/fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/16.0-rc/fpm-alpine/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/16.0-rc/fpm-alpine/config/apps.config.php b/16.0-rc/fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/16.0-rc/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/16.0-rc/fpm-alpine/config/autoconfig.php b/16.0-rc/fpm-alpine/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/16.0-rc/fpm-alpine/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/16.0-rc/fpm-alpine/config/redis.config.php b/16.0-rc/fpm-alpine/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/16.0-rc/fpm-alpine/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/16.0-rc/fpm-alpine/config/smtp.config.php b/16.0-rc/fpm-alpine/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/16.0-rc/fpm-alpine/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/16.0-rc/fpm-alpine/cron.sh b/16.0-rc/fpm-alpine/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/16.0-rc/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/16.0-rc/fpm-alpine/entrypoint.sh b/16.0-rc/fpm-alpine/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/16.0-rc/fpm-alpine/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/16.0-rc/fpm-alpine/upgrade.exclude b/16.0-rc/fpm-alpine/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/16.0-rc/fpm-alpine/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/16.0-rc/fpm/Dockerfile b/16.0-rc/fpm/Dockerfile
deleted file mode 100644
index 19543ff0..00000000
--- a/16.0-rc/fpm/Dockerfile
+++ /dev/null
@@ -1,143 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.3-fpm-buster
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apt-get update; \
- apt-get install -y --no-install-recommends \
- rsync \
- bzip2 \
- busybox-static \
- ; \
- rm -rf /var/lib/apt/lists/*; \
- \
- mkdir -p /var/spool/cron/crontabs; \
- echo '*/15 * * * * 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; \
- \
- 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)"; \
- if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \
- docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install -j "$(nproc)" \
- 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.18; \
- pecl install memcached-3.1.4; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.4; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# 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/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.interned_strings_buffer=8'; \
- echo 'opcache.max_accelerated_files=10000'; \
- echo 'opcache.memory_consumption=128'; \
- echo 'opcache.save_comments=1'; \
- echo 'opcache.revalidate_freq=1'; \
- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.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 16.0.6RC1
-
-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/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
- curl -fsSL -o nextcloud.tar.bz2.asc \
- "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
- export GNUPGHOME="$(mktemp -d)"; \
-# gpg key from https://nextcloud.com/nextcloud.asc
- gpg --batch --keyserver ha.pool.sks-keyservers.net --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 -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /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/16.0-rc/fpm/config/apcu.config.php b/16.0-rc/fpm/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/16.0-rc/fpm/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/16.0-rc/fpm/config/apps.config.php b/16.0-rc/fpm/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/16.0-rc/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/16.0-rc/fpm/config/autoconfig.php b/16.0-rc/fpm/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/16.0-rc/fpm/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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') && 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') && 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) {
- if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
- }
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/16.0-rc/fpm/config/redis.config.php b/16.0-rc/fpm/config/redis.config.php
deleted file mode 100644
index 19676160..00000000
--- a/16.0-rc/fpm/config/redis.config.php
+++ /dev/null
@@ -1,13 +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'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- 'password' => getenv('REDIS_HOST_PASSWORD'),
- ),
- );
-}
-
diff --git a/16.0-rc/fpm/config/smtp.config.php b/16.0-rc/fpm/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/16.0-rc/fpm/config/smtp.config.php
+++ /dev/null
@@ -1,15 +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_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
- 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
- 'mail_domain' => getenv('MAIL_DOMAIN'),
- );
-}
diff --git a/16.0-rc/fpm/cron.sh b/16.0-rc/fpm/cron.sh
deleted file mode 100755
index 4dfa4118..00000000
--- a/16.0-rc/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/16.0-rc/fpm/entrypoint.sh b/16.0-rc/fpm/entrypoint.sh
deleted file mode 100755
index 9514d881..00000000
--- a/16.0-rc/fpm/entrypoint.sh
+++ /dev/null
@@ -1,145 +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
-}
-
-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"
- {
- echo 'session.save_handler = redis'
- # check if redis password has been set
- if [ -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
- } > /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
- 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/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- 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_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- 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 3s
- 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 "running 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
- fi
-fi
-
-exec "$@"
diff --git a/16.0-rc/fpm/upgrade.exclude b/16.0-rc/fpm/upgrade.exclude
deleted file mode 100644
index 354864da..00000000
--- a/16.0-rc/fpm/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile
index c34a93dd..ca1ae292 100644
--- a/16.0/apache/Dockerfile
+++ b/16.0/apache/Dockerfile
@@ -115,7 +115,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 16.0.5
+ENV NEXTCLOUD_VERSION 16.0.6
RUN set -ex; \
fetchDeps=" \
diff --git a/16.0/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile
index cf2af2ef..419b3ba3 100644
--- a/16.0/fpm-alpine/Dockerfile
+++ b/16.0/fpm-alpine/Dockerfile
@@ -94,7 +94,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 16.0.5
+ENV NEXTCLOUD_VERSION 16.0.6
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile
index de86b374..3f9d4013 100644
--- a/16.0/fpm/Dockerfile
+++ b/16.0/fpm/Dockerfile
@@ -107,7 +107,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 16.0.5
+ENV NEXTCLOUD_VERSION 16.0.6
RUN set -ex; \
fetchDeps=" \