diff options
author | tilosp-bot <git-bot@tilosp.de> | 2020-03-06 13:00:55 +0000 |
---|---|---|
committer | tilosp-bot <git-bot@tilosp.de> | 2020-03-06 13:00:55 +0000 |
commit | da5b3bed1f02ec43901f17b524ed2d2b124d3f6c (patch) | |
tree | a83c7cb0d9397d8ff430cceb570575031f22db16 | |
parent | ac8c9984319e45fd34fa3863f82fd9063d628aa4 (diff) |
Run update.sh18.0.2RC1-fpm-alpine18.0.2RC1-fpm18.0.2RC1-apache18.0.2RC117.0.4RC1-fpm-alpine17.0.4RC1-fpm17.0.4RC1-apache17.0.4RC116.0.9RC1-fpm-alpine16.0.9RC1-fpm16.0.9RC1-apache16.0.9RC1
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
85 files changed, 3478 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ab3f4686..81052f78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,25 @@ jobs: - travis_retry ./generate-stackbrew-library.sh - stage: test images - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64 + 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=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=18.0-rc VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=18.0-rc VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=18.0-rc VARIANT=fpm ARCH=amd64 + - env: VERSION=18.0-rc VARIANT=fpm ARCH=i386 + - env: VERSION=18.0-rc VARIANT=apache ARCH=amd64 + - env: VERSION=18.0-rc VARIANT=apache ARCH=i386 + - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=16.0 VARIANT=fpm ARCH=amd64 - env: VERSION=16.0 VARIANT=fpm ARCH=i386 diff --git a/16.0-rc/apache/Dockerfile b/16.0-rc/apache/Dockerfile new file mode 100644 index 00000000..a22b5e26 --- /dev/null +++ b/16.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 '*/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.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 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.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 -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 new file mode 100644 index 00000000..72da1d8c --- /dev/null +++ b/16.0-rc/apache/config/apache-pretty-urls.config.php @@ -0,0 +1,4 @@ +<?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 new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/16.0-rc/apache/config/apcu.config.php @@ -0,0 +1,4 @@ +<?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 new file mode 100644 index 00000000..a4bed833 --- /dev/null +++ b/16.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/16.0-rc/apache/config/autoconfig.php b/16.0-rc/apache/config/autoconfig.php new file mode 100644 index 00000000..deeabe4e --- /dev/null +++ b/16.0-rc/apache/config/autoconfig.php @@ -0,0 +1,31 @@ +<?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 new file mode 100644 index 00000000..9429c901 --- /dev/null +++ b/16.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/16.0-rc/apache/config/smtp.config.php b/16.0-rc/apache/config/smtp.config.php new file mode 100644 index 00000000..59f1eaa1 --- /dev/null +++ b/16.0-rc/apache/config/smtp.config.php @@ -0,0 +1,15 @@ +<?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') ?: '' |