summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilosp-bot <git-bot@tilosp.de>2020-08-20 14:00:22 +0000
committertilosp-bot <git-bot@tilosp.de>2020-08-20 14:00:22 +0000
commitbd4cf887a4741837c66ff4b8100a1787ebb6512c (patch)
treea8a200b14fb1ba6168fa7b68ff8e35fb406a08e1
parentabe8cd69a6a3eee4952d4faea9dfbda64c4cdb2b (diff)
Run update.sh
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
-rw-r--r--17.0-rc/apache/Dockerfile151
-rw-r--r--17.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--17.0-rc/apache/config/apcu.config.php4
-rw-r--r--17.0-rc/apache/config/apps.config.php15
-rw-r--r--17.0-rc/apache/config/autoconfig.php27
-rw-r--r--17.0-rc/apache/config/redis.config.php17
-rw-r--r--17.0-rc/apache/config/reverse-proxy.config.php25
-rw-r--r--17.0-rc/apache/config/smtp.config.php15
-rwxr-xr-x17.0-rc/apache/cron.sh4
-rwxr-xr-x17.0-rc/apache/entrypoint.sh188
-rw-r--r--17.0-rc/apache/upgrade.exclude5
-rw-r--r--17.0-rc/fpm-alpine/Dockerfile126
-rw-r--r--17.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--17.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--17.0-rc/fpm-alpine/config/autoconfig.php27
-rw-r--r--17.0-rc/fpm-alpine/config/redis.config.php17
-rw-r--r--17.0-rc/fpm-alpine/config/reverse-proxy.config.php25
-rw-r--r--17.0-rc/fpm-alpine/config/smtp.config.php15
-rwxr-xr-x17.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x17.0-rc/fpm-alpine/entrypoint.sh188
-rw-r--r--17.0-rc/fpm-alpine/upgrade.exclude5
-rw-r--r--17.0-rc/fpm/Dockerfile143
-rw-r--r--17.0-rc/fpm/config/apcu.config.php4
-rw-r--r--17.0-rc/fpm/config/apps.config.php15
-rw-r--r--17.0-rc/fpm/config/autoconfig.php27
-rw-r--r--17.0-rc/fpm/config/redis.config.php17
-rw-r--r--17.0-rc/fpm/config/reverse-proxy.config.php25
-rw-r--r--17.0-rc/fpm/config/smtp.config.php15
-rwxr-xr-x17.0-rc/fpm/cron.sh4
-rwxr-xr-x17.0-rc/fpm/entrypoint.sh188
-rw-r--r--17.0-rc/fpm/upgrade.exclude5
-rw-r--r--18.0-rc/apache/Dockerfile151
-rw-r--r--18.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--18.0-rc/apache/config/apcu.config.php4
-rw-r--r--18.0-rc/apache/config/apps.config.php15
-rw-r--r--18.0-rc/apache/config/autoconfig.php27
-rw-r--r--18.0-rc/apache/config/redis.config.php17
-rw-r--r--18.0-rc/apache/config/reverse-proxy.config.php25
-rw-r--r--18.0-rc/apache/config/smtp.config.php15
-rwxr-xr-x18.0-rc/apache/cron.sh4
-rwxr-xr-x18.0-rc/apache/entrypoint.sh188
-rw-r--r--18.0-rc/apache/upgrade.exclude5
-rw-r--r--18.0-rc/fpm-alpine/Dockerfile126
-rw-r--r--18.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--18.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--18.0-rc/fpm-alpine/config/autoconfig.php27
-rw-r--r--18.0-rc/fpm-alpine/config/redis.config.php17
-rw-r--r--18.0-rc/fpm-alpine/config/reverse-proxy.config.php25
-rw-r--r--18.0-rc/fpm-alpine/config/smtp.config.php15
-rwxr-xr-x18.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x18.0-rc/fpm-alpine/entrypoint.sh188
-rw-r--r--18.0-rc/fpm-alpine/upgrade.exclude5
-rw-r--r--18.0-rc/fpm/Dockerfile143
-rw-r--r--18.0-rc/fpm/config/apcu.config.php4
-rw-r--r--18.0-rc/fpm/config/apps.config.php15
-rw-r--r--18.0-rc/fpm/config/autoconfig.php27
-rw-r--r--18.0-rc/fpm/config/redis.config.php17
-rw-r--r--18.0-rc/fpm/config/reverse-proxy.config.php25
-rw-r--r--18.0-rc/fpm/config/smtp.config.php15
-rwxr-xr-x18.0-rc/fpm/cron.sh4
-rwxr-xr-x18.0-rc/fpm/entrypoint.sh188
-rw-r--r--18.0-rc/fpm/upgrade.exclude5
-rw-r--r--19.0-rc/apache/Dockerfile150
-rw-r--r--19.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--19.0-rc/apache/config/apcu.config.php4
-rw-r--r--19.0-rc/apache/config/apps.config.php15
-rw-r--r--19.0-rc/apache/config/autoconfig.php27
-rw-r--r--19.0-rc/apache/config/redis.config.php17
-rw-r--r--19.0-rc/apache/config/reverse-proxy.config.php25
-rw-r--r--19.0-rc/apache/config/smtp.config.php15
-rwxr-xr-x19.0-rc/apache/cron.sh4
-rwxr-xr-x19.0-rc/apache/entrypoint.sh188
-rw-r--r--19.0-rc/apache/upgrade.exclude5
-rw-r--r--19.0-rc/fpm-alpine/Dockerfile127
-rw-r--r--19.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--19.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--19.0-rc/fpm-alpine/config/autoconfig.php27
-rw-r--r--19.0-rc/fpm-alpine/config/redis.config.php17
-rw-r--r--19.0-rc/fpm-alpine/config/reverse-proxy.config.php25
-rw-r--r--19.0-rc/fpm-alpine/config/smtp.config.php15
-rwxr-xr-x19.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x19.0-rc/fpm-alpine/entrypoint.sh188
-rw-r--r--19.0-rc/fpm-alpine/upgrade.exclude5
-rw-r--r--19.0-rc/fpm/Dockerfile142
-rw-r--r--19.0-rc/fpm/config/apcu.config.php4
-rw-r--r--19.0-rc/fpm/config/apps.config.php15
-rw-r--r--19.0-rc/fpm/config/autoconfig.php27
-rw-r--r--19.0-rc/fpm/config/redis.config.php17
-rw-r--r--19.0-rc/fpm/config/reverse-proxy.config.php25
-rw-r--r--19.0-rc/fpm/config/smtp.config.php15
-rwxr-xr-x19.0-rc/fpm/cron.sh4
-rwxr-xr-x19.0-rc/fpm/entrypoint.sh188
-rw-r--r--19.0-rc/fpm/upgrade.exclude5
93 files changed, 3971 insertions, 0 deletions
diff --git a/17.0-rc/apache/Dockerfile b/17.0-rc/apache/Dockerfile
new file mode 100644
index 00000000..ffbf84d5
--- /dev/null
+++ b/17.0-rc/apache/Dockerfile
@@ -0,0 +1,151 @@
+# 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.5; \
+ 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 headers rewrite remoteip ;\
+ {\
+ echo RemoteIPHeader X-Real-IP ;\
+ echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
+ echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
+ echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
+ } > /etc/apache2/conf-available/remoteip.conf;\
+ a2enconf remoteip
+
+ENV NEXTCLOUD_VERSION 17.0.9RC1
+
+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 nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
+ rm -rf "$GNUPGHOME" /usr/src/nextcloud/updater; \
+ mkdir -p /usr/src/nextcloud/data; \
+ mkdir -p /usr/src/nextcloud/custom_apps; \
+ chmod +x /usr/src/nextcloud/occ; \
+ \
+ apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
+ rm -rf /var/lib/apt/lists/*
+
+COPY *.sh upgrade.exclude /
+COPY config/* /usr/src/nextcloud/config/
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["apache2-foreground"]
diff --git a/17.0-rc/apache/config/apache-pretty-urls.config.php b/17.0-rc/apache/config/apache-pretty-urls.config.php
new file mode 100644
index 00000000..72da1d8c
--- /dev/null
+++ b/17.0-rc/apache/config/apache-pretty-urls.config.php
@@ -0,0 +1,4 @@
+<?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
new file mode 100644
index 00000000..69fed876
--- /dev/null
+++ b/17.0-rc/apache/config/apcu.config.php
@@ -0,0 +1,4 @@
+<?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
new file mode 100644
index 00000000..a4bed833
--- /dev/null
+++ b/17.0-rc/apache/config/apps.config.php
@@ -0,0 +1,15 @@
+<?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
new file mode 100644
index 00000000..5bb85d42
--- /dev/null
+++ b/17.0-rc/apache/config/autoconfig.php
@@ -0,0 +1,27 @@
+<?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) {
+ $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
new file mode 100644
index 00000000..9429c901
--- /dev/null
+++ b/17.0-rc/apache/config/redis.config.php
@@ -0,0 +1,17 @@
+<?php
+if (getenv('REDIS_HOST')) {
+ $CONFIG = array (
+ 'memcache.distributed' => '\OC\Memcache\Redis',
+ 'memcache.locking' => '\OC\Memcache\Redis',
+ 'redis' => array(
+ 'host' => getenv('REDIS_HOST'),
+ 'password' => getenv('REDIS_HOST_PASSWORD'),
+ ),
+ );
+
+ if (getenv('REDIS_HOST_PORT') !== false) {
+ $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
+ } elseif (getenv('REDIS_HOST')[0] != '/') {
+ $CONFIG['redis']['port'] = 6379;
+ }
+}
diff --git a/17.0-rc/apache/config/reverse-proxy.config.php b/17.0-rc/apache/config/reverse-proxy.config.php
new file mode 100644
index 00000000..667be312
--- /dev/null
+++ b/17.0-rc/apache/config/reverse-proxy.config.php
@@ -0,0 +1,25 @@
+<?php
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+ $CONFIG['overwritehost'] = $overwriteHost;
+}
+
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+ $CONFIG['overwriteprotocol'] = $overwriteProtocol;
+}
+
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+ $CONFIG['overwritewebroot'] = $overwriteWebRoot;
+}
+
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+ $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
+}
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+ $CONFIG['trusted_proxies'] = array_filter(