Merge pull request #280 from nextcloud/rc
Add images for the Release Candidates
This commit is contained in:
Tilo Spannagel
GitHub
commit
192194e4f7
20
.travis.yml
20
.travis.yml
@ -49,7 +49,25 @@ jobs:
|
|||||||
- ./generate-stackbrew-library.sh
|
- ./generate-stackbrew-library.sh
|
||||||
|
|
||||||
- stage: test images
|
- stage: test images
|
||||||
env: VERSION=11.0 VARIANT=fpm-alpine ARCH=amd64
|
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=i386
|
- env: VERSION=11.0 VARIANT=fpm-alpine ARCH=i386
|
||||||
- env: VERSION=11.0 VARIANT=fpm ARCH=amd64
|
- env: VERSION=11.0 VARIANT=fpm ARCH=amd64
|
||||||
- env: VERSION=11.0 VARIANT=fpm ARCH=i386
|
- env: VERSION=11.0 VARIANT=fpm ARCH=i386
|
||||||
|
|||||||
122
11.0-rc/apache/Dockerfile
Normal file
122
11.0-rc/apache/Dockerfile
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
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"]
|
||||||
4
11.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
4
11.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'htaccess.RewriteBase' => '/',
|
||||||
|
);
|
||||||
4
11.0-rc/apache/config/apcu.config.php
Normal file
4
11.0-rc/apache/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
11.0-rc/apache/config/apps.config.php
Normal file
15
11.0-rc/apache/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
11.0-rc/apache/config/autoconfig.php
Normal file
34
11.0-rc/apache/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
11.0-rc/apache/cron.sh
Executable file
4
11.0-rc/apache/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
11.0-rc/apache/entrypoint.sh
Executable file
60
11.0-rc/apache/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
118
11.0-rc/fpm-alpine/Dockerfile
Normal file
118
11.0-rc/fpm-alpine/Dockerfile
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
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"]
|
||||||
4
11.0-rc/fpm-alpine/config/apcu.config.php
Normal file
4
11.0-rc/fpm-alpine/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
11.0-rc/fpm-alpine/config/apps.config.php
Normal file
15
11.0-rc/fpm-alpine/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
11.0-rc/fpm-alpine/config/autoconfig.php
Normal file
34
11.0-rc/fpm-alpine/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
11.0-rc/fpm-alpine/cron.sh
Executable file
4
11.0-rc/fpm-alpine/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
11.0-rc/fpm-alpine/entrypoint.sh
Executable file
60
11.0-rc/fpm-alpine/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
121
11.0-rc/fpm/Dockerfile
Normal file
121
11.0-rc/fpm/Dockerfile
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
FROM php:7.1-fpm
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
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 ["php-fpm"]
|
||||||
4
11.0-rc/fpm/config/apcu.config.php
Normal file
4
11.0-rc/fpm/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
11.0-rc/fpm/config/apps.config.php
Normal file
15
11.0-rc/fpm/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
11.0-rc/fpm/config/autoconfig.php
Normal file
34
11.0-rc/fpm/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
11.0-rc/fpm/cron.sh
Executable file
4
11.0-rc/fpm/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
11.0-rc/fpm/entrypoint.sh
Executable file
60
11.0-rc/fpm/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
122
12.0-rc/apache/Dockerfile
Normal file
122
12.0-rc/apache/Dockerfile
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
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 12.0.6RC1
|
||||||
|
|
||||||
|
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"]
|
||||||
4
12.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
4
12.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'htaccess.RewriteBase' => '/',
|
||||||
|
);
|
||||||
4
12.0-rc/apache/config/apcu.config.php
Normal file
4
12.0-rc/apache/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
12.0-rc/apache/config/apps.config.php
Normal file
15
12.0-rc/apache/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
12.0-rc/apache/config/autoconfig.php
Normal file
34
12.0-rc/apache/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
12.0-rc/apache/cron.sh
Executable file
4
12.0-rc/apache/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
12.0-rc/apache/entrypoint.sh
Executable file
60
12.0-rc/apache/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
118
12.0-rc/fpm-alpine/Dockerfile
Normal file
118
12.0-rc/fpm-alpine/Dockerfile
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
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 12.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 --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"]
|
||||||
4
12.0-rc/fpm-alpine/config/apcu.config.php
Normal file
4
12.0-rc/fpm-alpine/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
12.0-rc/fpm-alpine/config/apps.config.php
Normal file
15
12.0-rc/fpm-alpine/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
12.0-rc/fpm-alpine/config/autoconfig.php
Normal file
34
12.0-rc/fpm-alpine/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
12.0-rc/fpm-alpine/cron.sh
Executable file
4
12.0-rc/fpm-alpine/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
12.0-rc/fpm-alpine/entrypoint.sh
Executable file
60
12.0-rc/fpm-alpine/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
121
12.0-rc/fpm/Dockerfile
Normal file
121
12.0-rc/fpm/Dockerfile
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
FROM php:7.1-fpm
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
ENV NEXTCLOUD_VERSION 12.0.6RC1
|
||||||
|
|
||||||
|
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 ["php-fpm"]
|
||||||
4
12.0-rc/fpm/config/apcu.config.php
Normal file
4
12.0-rc/fpm/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
12.0-rc/fpm/config/apps.config.php
Normal file
15
12.0-rc/fpm/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
12.0-rc/fpm/config/autoconfig.php
Normal file
34
12.0-rc/fpm/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
12.0-rc/fpm/cron.sh
Executable file
4
12.0-rc/fpm/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
12.0-rc/fpm/entrypoint.sh
Executable file
60
12.0-rc/fpm/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
122
13.0-rc/apache/Dockerfile
Normal file
122
13.0-rc/apache/Dockerfile
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
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 13.0.1RC1
|
||||||
|
|
||||||
|
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"]
|
||||||
4
13.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
4
13.0-rc/apache/config/apache-pretty-urls.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'htaccess.RewriteBase' => '/',
|
||||||
|
);
|
||||||
4
13.0-rc/apache/config/apcu.config.php
Normal file
4
13.0-rc/apache/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
13.0-rc/apache/config/apps.config.php
Normal file
15
13.0-rc/apache/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
13.0-rc/apache/config/autoconfig.php
Normal file
34
13.0-rc/apache/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
13.0-rc/apache/cron.sh
Executable file
4
13.0-rc/apache/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
13.0-rc/apache/entrypoint.sh
Executable file
60
13.0-rc/apache/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
118
13.0-rc/fpm-alpine/Dockerfile
Normal file
118
13.0-rc/fpm-alpine/Dockerfile
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
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 13.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 --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"]
|
||||||
4
13.0-rc/fpm-alpine/config/apcu.config.php
Normal file
4
13.0-rc/fpm-alpine/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
13.0-rc/fpm-alpine/config/apps.config.php
Normal file
15
13.0-rc/fpm-alpine/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
13.0-rc/fpm-alpine/config/autoconfig.php
Normal file
34
13.0-rc/fpm-alpine/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
13.0-rc/fpm-alpine/cron.sh
Executable file
4
13.0-rc/fpm-alpine/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
13.0-rc/fpm-alpine/entrypoint.sh
Executable file
60
13.0-rc/fpm-alpine/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
121
13.0-rc/fpm/Dockerfile
Normal file
121
13.0-rc/fpm/Dockerfile
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
FROM php:7.1-fpm
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
ENV NEXTCLOUD_VERSION 13.0.1RC1
|
||||||
|
|
||||||
|
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 ["php-fpm"]
|
||||||
4
13.0-rc/fpm/config/apcu.config.php
Normal file
4
13.0-rc/fpm/config/apcu.config.php
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<?php
|
||||||
|
$CONFIG = array (
|
||||||
|
'memcache.local' => '\OC\Memcache\APCu',
|
||||||
|
);
|
||||||
15
13.0-rc/fpm/config/apps.config.php
Normal file
15
13.0-rc/fpm/config/apps.config.php
Normal file
@ -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,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
34
13.0-rc/fpm/config/autoconfig.php
Normal file
34
13.0-rc/fpm/config/autoconfig.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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');
|
||||||
|
}
|
||||||
|
}
|
||||||
4
13.0-rc/fpm/cron.sh
Executable file
4
13.0-rc/fpm/cron.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
exec busybox crond -f -l 0 -L /dev/stdout
|
||||||
60
13.0-rc/fpm/entrypoint.sh
Executable file
60
13.0-rc/fpm/entrypoint.sh
Executable file
@ -0,0 +1,60 @@
|
|||||||
|
#!/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 "$@"
|
||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -95,9 +95,9 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 \
|
curl -fsSL -o nextcloud.tar.bz2 \
|
||||||
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
|
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc \
|
curl -fsSL -o nextcloud.tar.bz2.asc \
|
||||||
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
|
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
|
|||||||
@ -99,9 +99,9 @@ ENV NEXTCLOUD_VERSION %%VERSION%%
|
|||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2 \
|
curl -fsSL -o nextcloud.tar.bz2 \
|
||||||
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
|
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc \
|
curl -fsSL -o nextcloud.tar.bz2.asc \
|
||||||
"https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
|
"%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
|
|||||||
@ -21,9 +21,9 @@ function run_as() {
|
|||||||
|
|
||||||
installed_version="0.0.0~unknown"
|
installed_version="0.0.0~unknown"
|
||||||
if [ -f /var/www/html/version.php ]; then
|
if [ -f /var/www/html/version.php ]; then
|
||||||
installed_version=$(php -r 'require "/var/www/html/version.php"; echo "$OC_VersionString";')
|
installed_version=$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')
|
||||||
fi
|
fi
|
||||||
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";')
|
image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')
|
||||||
|
|
||||||
if version_greater "$installed_version" "$image_version"; then
|
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?"
|
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?"
|
||||||
|
|||||||
@ -16,12 +16,12 @@ dockerfileCommit() {
|
|||||||
(
|
(
|
||||||
cd "$dir";
|
cd "$dir";
|
||||||
fileCommit Dockerfile \
|
fileCommit Dockerfile \
|
||||||
$(git show HEAD:./Dockerfile | awk '
|
$(awk '
|
||||||
toupper($1) == "COPY" {
|
toupper($1) == "COPY" {
|
||||||
for (i = 2; i < NF; i++)
|
for (i = 2; i < NF; i++)
|
||||||
print $i;
|
print $i;
|
||||||
}
|
}
|
||||||
')
|
' Dockerfile)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,8 +57,14 @@ join() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
latest=$( curl -fsSL 'https://download.nextcloud.com/server/releases/' |tac|tac| \
|
latest=$( curl -fsSL 'https://download.nextcloud.com/server/releases/' |tac|tac| \
|
||||||
grep -oE 'nextcloud-[[:digit:]]+(.[[:digit:]]+)+' | \
|
grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}' | \
|
||||||
grep -oE '[[:digit:]]+(.[[:digit:]]+)+' | \
|
grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}' | \
|
||||||
|
sort -uV | \
|
||||||
|
tail -1 )
|
||||||
|
|
||||||
|
latest_rc=$( curl -fsSL 'https://download.nextcloud.com/server/prereleases/' |tac|tac| \
|
||||||
|
grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
|
||||||
|
grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
|
||||||
sort -uV | \
|
sort -uV | \
|
||||||
tail -1 )
|
tail -1 )
|
||||||
|
|
||||||
@ -72,12 +78,23 @@ for version in "${versions[@]}"; do
|
|||||||
done) )
|
done) )
|
||||||
for variant in "${variants[@]}"; do
|
for variant in "${variants[@]}"; do
|
||||||
commit="$(dockerfileCommit "$version/$variant")"
|
commit="$(dockerfileCommit "$version/$variant")"
|
||||||
fullversion="$(git show "$commit":"$version/$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "NEXTCLOUD_VERSION" { print $3; exit }')"
|
fullversion_with_extension="$( awk '$1 == "ENV" && $2 == "NEXTCLOUD_VERSION" { print $3; exit }' "$version/$variant/Dockerfile" )"
|
||||||
|
fullversion="$( echo "$fullversion_with_extension" | grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}')"
|
||||||
|
|
||||||
versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
|
versionAliases=( )
|
||||||
if [ "$fullversion" = "$latest" ]; then
|
versionPostfix=""
|
||||||
|
if [ "$fullversion_with_extension" != "$fullversion" ]; then
|
||||||
|
versionAliases=( "$fullversion_with_extension" )
|
||||||
|
versionPostfix="-rc"
|
||||||
|
fi
|
||||||
|
|
||||||
|
versionAliases+=( "$fullversion$versionPostfix" "${fullversion%.*}$versionPostfix" "${fullversion%.*.*}$versionPostfix" )
|
||||||
|
if [ "$fullversion_with_extension" = "$latest" ]; then
|
||||||
versionAliases+=( "latest" )
|
versionAliases+=( "latest" )
|
||||||
fi
|
fi
|
||||||
|
if [ "$fullversion_with_extension" = "$latest_rc" ]; then
|
||||||
|
versionAliases+=( "rc" )
|
||||||
|
fi
|
||||||
|
|
||||||
variantAliases=( "${versionAliases[@]/%/-$variant}" )
|
variantAliases=( "${versionAliases[@]/%/-$variant}" )
|
||||||
variantAliases=( "${variantAliases[@]//latest-}" )
|
variantAliases=( "${variantAliases[@]//latest-}" )
|
||||||
|
|||||||
126
update.sh
126
update.sh
@ -29,70 +29,106 @@ declare -A pecl_versions=(
|
|||||||
[redis]='3.1.6'
|
[redis]='3.1.6'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
variants=(
|
||||||
|
apache
|
||||||
|
fpm
|
||||||
|
fpm-alpine
|
||||||
|
)
|
||||||
|
|
||||||
|
min_version='11.0'
|
||||||
|
|
||||||
# version_greater_or_equal A B returns whether A >= B
|
# version_greater_or_equal A B returns whether A >= B
|
||||||
function version_greater_or_equal() {
|
function version_greater_or_equal() {
|
||||||
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]];
|
[[ "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" || "$1" == "$2" ]];
|
||||||
}
|
}
|
||||||
|
|
||||||
latests=( $( curl -fsSL 'https://download.nextcloud.com/server/releases/' |tac|tac| \
|
# checks if the the rc is already released
|
||||||
grep -oE 'nextcloud-[[:digit:]]+(.[[:digit:]]+)+' | \
|
function check_released() {
|
||||||
grep -oE '[[:digit:]]+(.[[:digit:]]+)+' | \
|
printf '%s\n' "${fullversions[@]}" | grep -qE "^$( echo "$1" | grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}' )"
|
||||||
sort -urV ) )
|
}
|
||||||
|
|
||||||
find . -maxdepth 1 -type d -regextype sed -regex '\./[[:digit:]]\+\.[[:digit:]]\+' -exec rm -r '{}' \;
|
|
||||||
|
|
||||||
travisEnv=
|
travisEnv=
|
||||||
for latest in "${latests[@]}"; do
|
|
||||||
version=$(echo "$latest" | cut -d. -f1-2)
|
|
||||||
|
|
||||||
if [ -d "$version" ]; then
|
function create_variant() {
|
||||||
continue
|
dir="$1/$variant"
|
||||||
|
|
||||||
|
# Create the version+variant directory with a Dockerfile.
|
||||||
|
mkdir -p "$dir"
|
||||||
|
|
||||||
|
cp "Dockerfile-${base[$variant]}.template" "$dir/Dockerfile"
|
||||||
|
|
||||||
|
echo "updating $fullversion [$1] $variant"
|
||||||
|
|
||||||
|
# Replace the variables.
|
||||||
|
sed -ri -e '
|
||||||
|
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
|
||||||
|
s/%%VARIANT%%/'"$variant"'/g;
|
||||||
|
s/%%VERSION%%/'"$fullversion"'/g;
|
||||||
|
s/%%BASE_DOWNLOAD_URL%%/'"$2"'/g;
|
||||||
|
s/%%CMD%%/'"${cmd[$variant]}"'/g;
|
||||||
|
s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g;
|
||||||
|
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
|
||||||
|
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
|
||||||
|
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
|
||||||
|
' "$dir/Dockerfile"
|
||||||
|
|
||||||
|
# Copy the shell scripts
|
||||||
|
for name in entrypoint cron; do
|
||||||
|
cp "docker-$name.sh" "$dir/$name.sh"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Copy the config directory
|
||||||
|
cp -rT .config "$dir/config"
|
||||||
|
|
||||||
|
# Remove Apache config if we're not an Apache variant.
|
||||||
|
if [ "$variant" != "apache" ]; then
|
||||||
|
rm "$dir/config/apache-pretty-urls.config.php"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Only add versions >= 11
|
for arch in i386 amd64; do
|
||||||
if version_greater_or_equal "$version" "11.0"; then
|
travisEnv='\n - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
for variant in apache fpm fpm-alpine; do
|
find . -maxdepth 1 -type d -regextype sed -regex '\./[[:digit:]]\+\.[[:digit:]]\+\(-rc\)\?' -exec rm -r '{}' \;
|
||||||
# Create the version+variant directory with a Dockerfile.
|
|
||||||
mkdir -p "$version/$variant"
|
|
||||||
|
|
||||||
template="Dockerfile-${base[$variant]}.template"
|
fullversions=( $( curl -fsSL 'https://download.nextcloud.com/server/releases/' |tac|tac| \
|
||||||
cp "$template" "$version/$variant/Dockerfile"
|
grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}' | \
|
||||||
|
grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}' | \
|
||||||
|
sort -urV ) )
|
||||||
|
versions=( $( printf '%s\n' "${fullversions[@]}" | cut -d. -f1-2 | sort -urV ) )
|
||||||
|
for version in "${versions[@]}"; do
|
||||||
|
fullversion="$( printf '%s\n' "${fullversions[@]}" | grep -E "^$version" | head -1 )"
|
||||||
|
|
||||||
echo "updating $latest [$version] $variant"
|
if version_greater_or_equal "$version" "$min_version"; then
|
||||||
|
|
||||||
# Replace the variables.
|
for variant in "${variants[@]}"; do
|
||||||
sed -ri -e '
|
|
||||||
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
|
|
||||||
s/%%VARIANT%%/'"$variant"'/g;
|
|
||||||
s/%%VERSION%%/'"$latest"'/g;
|
|
||||||
s/%%CMD%%/'"${cmd[$variant]}"'/g;
|
|
||||||
s/%%VARIANT_EXTRAS%%/'"${extras[$variant]}"'/g;
|
|
||||||
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
|
|
||||||
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
|
|
||||||
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
|
|
||||||
' "$version/$variant/Dockerfile"
|
|
||||||
|
|
||||||
# Copy the shell scripts
|
create_variant "$version" "https:\/\/download.nextcloud.com\/server\/releases"
|
||||||
for name in entrypoint cron; do
|
|
||||||
cp "docker-$name.sh" "$version/$variant/$name.sh"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Copy the config directory
|
|
||||||
cp -rT .config "$version/$variant/config"
|
|
||||||
|
|
||||||
# Remove Apache config if we're not an Apache variant.
|
|
||||||
if [ "$variant" != "apache" ]; then
|
|
||||||
rm "$version/$variant/config/apache-pretty-urls.config.php"
|
|
||||||
fi
|
|
||||||
|
|
||||||
for arch in i386 amd64; do
|
|
||||||
travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
|
|
||||||
done
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
fullversions_rc=( $( curl -fsSL 'https://download.nextcloud.com/server/prereleases/' |tac|tac| \
|
||||||
|
grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
|
||||||
|
grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}RC[[:digit:]]+' | \
|
||||||
|
sort -urV ) )
|
||||||
|
versions_rc=( $( printf '%s\n' "${fullversions_rc[@]}" | cut -d. -f1-2 | sort -urV ) )
|
||||||
|
for version in "${versions_rc[@]}"; do
|
||||||
|
fullversion="$( printf '%s\n' "${fullversions_rc[@]}" | grep -E "^$version" | head -1 )"
|
||||||
|
|
||||||
|
if version_greater_or_equal "$version" "$min_version"; then
|
||||||
|
|
||||||
|
if ! check_released "$fullversion"; then
|
||||||
|
|
||||||
|
for variant in "${variants[@]}"; do
|
||||||
|
|
||||||
|
create_variant "$version-rc" "https:\/\/download.nextcloud.com\/server\/prereleases"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
# replace the fist '-' with ' '
|
# replace the fist '-' with ' '
|
||||||
travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
|
travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user