summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2018-03-15 11:59:13 +0100
committerTilo Spannagel <development@tilosp.de>2018-03-15 11:59:13 +0100
commitfbc8a53801d6bfad04fc79144848df856e11cf02 (patch)
treecc98d67cad96d42d963832e22871e4895e79e27d
parent2ededcab117c5286ddd0e5b42765555dd97404ae (diff)
Run update.sh
-rw-r--r--.travis.yml20
-rw-r--r--11.0-rc/apache/Dockerfile122
-rw-r--r--11.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--11.0-rc/apache/config/apcu.config.php4
-rw-r--r--11.0-rc/apache/config/apps.config.php15
-rw-r--r--11.0-rc/apache/config/autoconfig.php34
-rwxr-xr-x11.0-rc/apache/cron.sh4
-rwxr-xr-x11.0-rc/apache/entrypoint.sh60
-rw-r--r--11.0-rc/fpm-alpine/Dockerfile118
-rw-r--r--11.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--11.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--11.0-rc/fpm-alpine/config/autoconfig.php34
-rwxr-xr-x11.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x11.0-rc/fpm-alpine/entrypoint.sh60
-rw-r--r--11.0-rc/fpm/Dockerfile121
-rw-r--r--11.0-rc/fpm/config/apcu.config.php4
-rw-r--r--11.0-rc/fpm/config/apps.config.php15
-rw-r--r--11.0-rc/fpm/config/autoconfig.php34
-rwxr-xr-x11.0-rc/fpm/cron.sh4
-rwxr-xr-x11.0-rc/fpm/entrypoint.sh60
-rw-r--r--12.0-rc/apache/Dockerfile122
-rw-r--r--12.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--12.0-rc/apache/config/apcu.config.php4
-rw-r--r--12.0-rc/apache/config/apps.config.php15
-rw-r--r--12.0-rc/apache/config/autoconfig.php34
-rwxr-xr-x12.0-rc/apache/cron.sh4
-rwxr-xr-x12.0-rc/apache/entrypoint.sh60
-rw-r--r--12.0-rc/fpm-alpine/Dockerfile118
-rw-r--r--12.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--12.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--12.0-rc/fpm-alpine/config/autoconfig.php34
-rwxr-xr-x12.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x12.0-rc/fpm-alpine/entrypoint.sh60
-rw-r--r--12.0-rc/fpm/Dockerfile121
-rw-r--r--12.0-rc/fpm/config/apcu.config.php4
-rw-r--r--12.0-rc/fpm/config/apps.config.php15
-rw-r--r--12.0-rc/fpm/config/autoconfig.php34
-rwxr-xr-x12.0-rc/fpm/cron.sh4
-rwxr-xr-x12.0-rc/fpm/entrypoint.sh60
-rw-r--r--13.0-rc/apache/Dockerfile122
-rw-r--r--13.0-rc/apache/config/apache-pretty-urls.config.php4
-rw-r--r--13.0-rc/apache/config/apcu.config.php4
-rw-r--r--13.0-rc/apache/config/apps.config.php15
-rw-r--r--13.0-rc/apache/config/autoconfig.php34
-rwxr-xr-x13.0-rc/apache/cron.sh4
-rwxr-xr-x13.0-rc/apache/entrypoint.sh60
-rw-r--r--13.0-rc/fpm-alpine/Dockerfile118
-rw-r--r--13.0-rc/fpm-alpine/config/apcu.config.php4
-rw-r--r--13.0-rc/fpm-alpine/config/apps.config.php15
-rw-r--r--13.0-rc/fpm-alpine/config/autoconfig.php34
-rwxr-xr-x13.0-rc/fpm-alpine/cron.sh4
-rwxr-xr-x13.0-rc/fpm-alpine/entrypoint.sh60
-rw-r--r--13.0-rc/fpm/Dockerfile121
-rw-r--r--13.0-rc/fpm/config/apcu.config.php4
-rw-r--r--13.0-rc/fpm/config/apps.config.php15
-rw-r--r--13.0-rc/fpm/config/autoconfig.php34
-rwxr-xr-x13.0-rc/fpm/cron.sh4
-rwxr-xr-x13.0-rc/fpm/entrypoint.sh60
58 files changed, 1 insertions, 2167 deletions
diff --git a/.travis.yml b/.travis.yml
index f4afd013..32e465cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,25 +49,7 @@ jobs:
- ./generate-stackbrew-library.sh
- stage: test images
- env: VERSION=11.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=11.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=11.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=11.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=11.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=11.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=12.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=12.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=12.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=12.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=13.0-rc VARIANT=fpm-alpine ARCH=amd64
- - env: VERSION=13.0-rc VARIANT=fpm-alpine ARCH=i386
- - env: VERSION=13.0-rc VARIANT=fpm ARCH=amd64
- - env: VERSION=13.0-rc VARIANT=fpm ARCH=i386
- - env: VERSION=13.0-rc VARIANT=apache ARCH=amd64
- - env: VERSION=13.0-rc VARIANT=apache ARCH=i386
- - env: VERSION=11.0 VARIANT=fpm-alpine ARCH=amd64
+ env: VERSION=11.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=11.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=11.0 VARIANT=fpm ARCH=amd64
- env: VERSION=11.0 VARIANT=fpm ARCH=i386
diff --git a/11.0-rc/apache/Dockerfile b/11.0-rc/apache/Dockerfile
deleted file mode 100644
index 4c908e3e..00000000
--- a/11.0-rc/apache/Dockerfile
+++ /dev/null
@@ -1,122 +0,0 @@
-FROM php:7.1-apache
-
-# 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/12/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 \
- libfreetype6-dev \
- libicu-dev \
- libjpeg-dev \
- libldap2-dev \
- libmcrypt-dev \
- libmemcached-dev \
- libpng12-dev \
- libpq-dev \
- libxml2-dev \
- ; \
- \
- debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
- docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
- docker-php-ext-install \
- exif \
- gd \
- intl \
- ldap \
- mbstring \
- mcrypt \
- mysqli \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- pgsql \
- zip \
- ; \
- pecl install \
- APCu-5.1.11 \
- memcached-3.0.4 \
- redis-3.1.6 \
- ; \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- ; \
- \
-# 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.enable_cli=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; \
- \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod rewrite
-
-ENV NEXTCLOUD_VERSION 11.0.8RC1
-
-RUN set -ex; \
- 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 --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- rm 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
-
-COPY *.sh /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/11.0-rc/apache/config/apache-pretty-urls.config.php b/11.0-rc/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c..00000000
--- a/11.0-rc/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/11.0-rc/apache/config/apcu.config.php b/11.0-rc/apache/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/11.0-rc/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/11.0-rc/apache/config/apps.config.php b/11.0-rc/apache/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/11.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/11.0-rc/apache/config/autoconfig.php b/11.0-rc/apache/config/autoconfig.php
deleted file mode 100644
index b759f4d1..00000000
--- a/11.0-rc/apache/config/autoconfig.php
+++ /dev/null
@@ -1,34 +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) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-
- if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
- $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
- $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
- }
-}
diff --git a/11.0-rc/apache/cron.sh b/11.0-rc/apache/cron.sh
deleted file mode 100755
index bb65a1fb..00000000
--- a/11.0-rc/apache/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/11.0-rc/apache/entrypoint.sh b/11.0-rc/apache/entrypoint.sh
deleted file mode 100755
index 0568aac1..00000000
--- a/11.0-rc/apache/entrypoint.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-set -e
-
-# version_greater A B returns whether A > B
-function version_greater() {
- [[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
-}
-
-# return true if specified directory is empty
-function directory_empty() {
- [ -n "$(find "$1"/ -prune -empty)" ]
-}
-
-function run_as() {
- if [[ $EUID -eq 0 ]]; then
- su - www-data -s /bin/bash -c "$1"
- else
- bash -c "$1"
- fi
-}
-
-installed_version="0.0.0~unknown"
-if [ -f /var/www/html/version.php ]; then
- installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
-fi
-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
- if [ "$installed_version" != "0.0.0~unknown" ]; then
- run_as 'php /var/www/html/occ app:list' > /tmp/list_before
- fi
- if [[ $EUID -eq 0 ]]; then
- rsync_options="-rlDog --chown www-data:root"
- else
- rsync_options="-rlD"
- fi
- rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /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
-
- if [ "$installed_version" != "0.0.0~unknown" ]; then
- run_as 'php /var/www/html/occ upgrade --no-app-disable'
-
- run_as 'php /var/www/html/occ app:list' > /tmp/list_after
- echo "The following apps have beed disabled:"
- diff <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_before) <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_after) | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
- fi
-fi
-
-exec "$@"
diff --git a/11.0-rc/fpm-alpine/Dockerfile b/11.0-rc/fpm-alpine/Dockerfile
deleted file mode 100644
index c5c68e88..00000000
--- a/11.0-rc/fpm-alpine/Dockerfile
+++ /dev/null
@@ -1,118 +0,0 @@
-FROM php:7.1-fpm-alpine
-
-# entrypoint.sh and cron.sh dependencies
-RUN set -ex; \
- \
- apk add --no-cache \
- bash \
- coreutils \
- 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/12/admin_manual/installation/source_installation.html
-RUN set -ex; \
- \
- apk add --no-cache --virtual .build-deps \
- alpine-sdk \
- autoconf \
- freetype-dev \
- icu-dev \
- libjpeg-turbo-dev \
- libmcrypt-dev \
- libpng-dev \
- libmemcached-dev \
- libxml2-dev \
- openldap-dev \
- pcre-dev \
- postgresql-dev \
- ; \
- \
- docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
- docker-php-ext-configure ldap; \
- docker-php-ext-install \
- exif \
- gd \
- intl \
- ldap \
- mbstring \
- mcrypt \
- mysqli \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- pgsql \
- zip \
- ; \
- pecl install \
- APCu-5.1.11 \
- memcached-3.0.4 \
- redis-3.1.6 \
- ; \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- ; \
- \
- 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.enable_cli=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; \
- \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-
-ENV NEXTCLOUD_VERSION 11.0.8RC1
-
-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 --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- rm 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 /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["php-fpm"]
diff --git a/11.0-rc/fpm-alpine/config/apcu.config.php b/11.0-rc/fpm-alpine/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/11.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/11.0-rc/fpm-alpine/config/apps.config.php b/11.0-rc/fpm-alpine/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/11.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/11.0-rc/fpm-alpine/config/autoconfig.php b/11.0-rc/fpm-alpine/config/autoconfig.php
deleted file mode 100644
index b759f4d1..00000000
--- a/11.0-rc/fpm-alpine/config/autoconfig.php
+++ /dev/null
@@ -1,34 +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) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-
- if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
- $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
- $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
- }
-}
diff --git a/11.0-rc/fpm-alpine/cron.sh b/11.0-rc/fpm-alpine/cron.sh
deleted file mode 100755
index bb65a1fb..00000000
--- a/11.0-rc/fpm-alpine/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -e
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/11.0-rc/fpm-alpine/entrypoint.sh b/11.0-rc/fpm-alpine/entrypoint.sh
deleted file mode 100755
index 0568aac1..00000000
--- a/11.0-rc/fpm-alpine/entrypoint.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-set -e
-
-# version_greater A B returns whether A > B
-function version_greater() {
- [[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" ]];
-}
-
-# return true if specified directory is empty
-function directory_empty() {
- [ -n "$(find "$1"/ -prune -empty)" ]
-}
-
-function run_as() {
- if [[ $EUID -eq 0 ]]; then
- su - www-data -s /bin/bash -c "$1"
- else
- bash -c "$1"
- fi
-}
-
-installed_version="0.0.0~unknown"
-if [ -f /var/www/html/version.php ]; then
- installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
-fi
-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?"