From 22de97f206a74a931c6e25439bf18ada178e990b Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 11 Feb 2018 02:58:17 +0100 Subject: [PATCH] Add Alpine variant --- .travis.yml | 8 +- 11.0/fpm-alpine/Dockerfile | 111 ++++++++++++++++++ 11.0/fpm-alpine/config/apcu.config.php | 4 + 11.0/fpm-alpine/config/apps.config.php | 15 +++ 11.0/fpm-alpine/config/autoconfig.php | 34 ++++++ 11.0/fpm-alpine/cron.sh | 4 + 11.0/fpm-alpine/entrypoint.sh | 60 ++++++++++ 12.0/fpm-alpine/Dockerfile | 111 ++++++++++++++++++ 12.0/fpm-alpine/config/apcu.config.php | 4 + 12.0/fpm-alpine/config/apps.config.php | 15 +++ 12.0/fpm-alpine/config/autoconfig.php | 34 ++++++ 12.0/fpm-alpine/cron.sh | 4 + 12.0/fpm-alpine/entrypoint.sh | 60 ++++++++++ 13.0/fpm-alpine/Dockerfile | 111 ++++++++++++++++++ 13.0/fpm-alpine/config/apcu.config.php | 4 + 13.0/fpm-alpine/config/apps.config.php | 15 +++ 13.0/fpm-alpine/config/autoconfig.php | 34 ++++++ 13.0/fpm-alpine/cron.sh | 4 + 13.0/fpm-alpine/entrypoint.sh | 60 ++++++++++ Dockerfile-alpine.template | 111 ++++++++++++++++++ ...ile.template => Dockerfile-debian.template | 0 update.sh | 12 +- 22 files changed, 812 insertions(+), 3 deletions(-) create mode 100644 11.0/fpm-alpine/Dockerfile create mode 100644 11.0/fpm-alpine/config/apcu.config.php create mode 100644 11.0/fpm-alpine/config/apps.config.php create mode 100644 11.0/fpm-alpine/config/autoconfig.php create mode 100755 11.0/fpm-alpine/cron.sh create mode 100755 11.0/fpm-alpine/entrypoint.sh create mode 100644 12.0/fpm-alpine/Dockerfile create mode 100644 12.0/fpm-alpine/config/apcu.config.php create mode 100644 12.0/fpm-alpine/config/apps.config.php create mode 100644 12.0/fpm-alpine/config/autoconfig.php create mode 100755 12.0/fpm-alpine/cron.sh create mode 100755 12.0/fpm-alpine/entrypoint.sh create mode 100644 13.0/fpm-alpine/Dockerfile create mode 100644 13.0/fpm-alpine/config/apcu.config.php create mode 100644 13.0/fpm-alpine/config/apps.config.php create mode 100644 13.0/fpm-alpine/config/autoconfig.php create mode 100755 13.0/fpm-alpine/cron.sh create mode 100755 13.0/fpm-alpine/entrypoint.sh create mode 100644 Dockerfile-alpine.template rename Dockerfile.template => Dockerfile-debian.template (100%) diff --git a/.travis.yml b/.travis.yml index daeeae5..d3b42b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,20 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images - env: VERSION=11.0 VARIANT=fpm ARCH=amd64 + env: VERSION=11.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=11.0 VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=11.0 VARIANT=fpm ARCH=amd64 - env: VERSION=11.0 VARIANT=fpm ARCH=i386 - env: VERSION=11.0 VARIANT=apache ARCH=amd64 - env: VERSION=11.0 VARIANT=apache ARCH=i386 + - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0 VARIANT=fpm ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm ARCH=i386 - env: VERSION=12.0 VARIANT=apache ARCH=amd64 - env: VERSION=12.0 VARIANT=apache ARCH=i386 + - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=13.0 VARIANT=fpm ARCH=amd64 - env: VERSION=13.0 VARIANT=fpm ARCH=i386 - env: VERSION=13.0 VARIANT=apache ARCH=amd64 diff --git a/11.0/fpm-alpine/Dockerfile b/11.0/fpm-alpine/Dockerfile new file mode 100644 index 0000000..2499742 --- /dev/null +++ b/11.0/fpm-alpine/Dockerfile @@ -0,0 +1,111 @@ +FROM php:7.1-fpm-alpine + +# entrypoint.sh dependencies +RUN apk add --no-cache \ + bash \ + coreutils \ + rsync + +# 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 \ + 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.9 \ + 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/html; \ + chmod -R g=u /var/www/html + +VOLUME /var/www/html + + +ENV NEXTCLOUD_VERSION 11.0.7 + +RUN set -ex; \ + apk add --no-cache --virtual .fetch-deps \ + bzip2 \ + gnupg \ + ; \ + \ + curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/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 entrypoint.sh / +COPY config/* /usr/src/nextcloud/config/ + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["php-fpm"] diff --git a/11.0/fpm-alpine/config/apcu.config.php b/11.0/fpm-alpine/config/apcu.config.php new file mode 100644 index 0000000..69fed87 --- /dev/null +++ b/11.0/fpm-alpine/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/11.0/fpm-alpine/config/apps.config.php b/11.0/fpm-alpine/config/apps.config.php new file mode 100644 index 0000000..a4bed83 --- /dev/null +++ b/11.0/fpm-alpine/config/apps.config.php @@ -0,0 +1,15 @@ + array ( + 0 => array ( + "path" => OC::$SERVERROOT."/apps", + "url" => "/apps", + "writable" => false, + ), + 1 => array ( + "path" => OC::$SERVERROOT."/custom_apps", + "url" => "/custom_apps", + "writable" => true, + ), + ), +); diff --git a/11.0/fpm-alpine/config/autoconfig.php b/11.0/fpm-alpine/config/autoconfig.php new file mode 100644 index 0000000..b759f4d --- /dev/null +++ b/11.0/fpm-alpine/config/autoconfig.php @@ -0,0 +1,34 @@ + 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 "$OC_VersionString";') +fi +image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";') + +if version_greater "$installed_version" "$image_version"; then + echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?" + exit 1 +fi + +if version_greater "$image_version" "$installed_version"; then + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ app:list' > /tmp/list_before + fi + if [[ $EUID -eq 0 ]]; then + rsync_options="-rlDog --chown www-data:root" + else + rsync_options="-rlD" + fi + rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ + + for dir in config data custom_apps themes; do + if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then + rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/ + fi + done + + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ upgrade --no-app-disable' + + run_as 'php /var/www/html/occ app:list' > /tmp/list_after + echo "The following apps have beed disabled:" + diff <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_before) <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_after) | grep '<' | cut -d- -f2 | cut -d: -f1 + rm -f /tmp/list_before /tmp/list_after + fi +fi + +exec "$@" diff --git a/12.0/fpm-alpine/Dockerfile b/12.0/fpm-alpine/Dockerfile new file mode 100644 index 0000000..1b039c5 --- /dev/null +++ b/12.0/fpm-alpine/Dockerfile @@ -0,0 +1,111 @@ +FROM php:7.1-fpm-alpine + +# entrypoint.sh dependencies +RUN apk add --no-cache \ + bash \ + coreutils \ + rsync + +# 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 \ + 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.9 \ + 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/html; \ + chmod -R g=u /var/www/html + +VOLUME /var/www/html + + +ENV NEXTCLOUD_VERSION 12.0.5 + +RUN set -ex; \ + apk add --no-cache --virtual .fetch-deps \ + bzip2 \ + gnupg \ + ; \ + \ + curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/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 entrypoint.sh / +COPY config/* /usr/src/nextcloud/config/ + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["php-fpm"] diff --git a/12.0/fpm-alpine/config/apcu.config.php b/12.0/fpm-alpine/config/apcu.config.php new file mode 100644 index 0000000..69fed87 --- /dev/null +++ b/12.0/fpm-alpine/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/12.0/fpm-alpine/config/apps.config.php b/12.0/fpm-alpine/config/apps.config.php new file mode 100644 index 0000000..a4bed83 --- /dev/null +++ b/12.0/fpm-alpine/config/apps.config.php @@ -0,0 +1,15 @@ + array ( + 0 => array ( + "path" => OC::$SERVERROOT."/apps", + "url" => "/apps", + "writable" => false, + ), + 1 => array ( + "path" => OC::$SERVERROOT."/custom_apps", + "url" => "/custom_apps", + "writable" => true, + ), + ), +); diff --git a/12.0/fpm-alpine/config/autoconfig.php b/12.0/fpm-alpine/config/autoconfig.php new file mode 100644 index 0000000..b759f4d --- /dev/null +++ b/12.0/fpm-alpine/config/autoconfig.php @@ -0,0 +1,34 @@ + 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 "$OC_VersionString";') +fi +image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";') + +if version_greater "$installed_version" "$image_version"; then + echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?" + exit 1 +fi + +if version_greater "$image_version" "$installed_version"; then + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ app:list' > /tmp/list_before + fi + if [[ $EUID -eq 0 ]]; then + rsync_options="-rlDog --chown www-data:root" + else + rsync_options="-rlD" + fi + rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ + + for dir in config data custom_apps themes; do + if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then + rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/ + fi + done + + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ upgrade --no-app-disable' + + run_as 'php /var/www/html/occ app:list' > /tmp/list_after + echo "The following apps have beed disabled:" + diff <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_before) <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_after) | grep '<' | cut -d- -f2 | cut -d: -f1 + rm -f /tmp/list_before /tmp/list_after + fi +fi + +exec "$@" diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile new file mode 100644 index 0000000..36a5bef --- /dev/null +++ b/13.0/fpm-alpine/Dockerfile @@ -0,0 +1,111 @@ +FROM php:7.1-fpm-alpine + +# entrypoint.sh dependencies +RUN apk add --no-cache \ + bash \ + coreutils \ + rsync + +# 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 \ + 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.9 \ + 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/html; \ + chmod -R g=u /var/www/html + +VOLUME /var/www/html + + +ENV NEXTCLOUD_VERSION 13.0.0 + +RUN set -ex; \ + apk add --no-cache --virtual .fetch-deps \ + bzip2 \ + gnupg \ + ; \ + \ + curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/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 entrypoint.sh / +COPY config/* /usr/src/nextcloud/config/ + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["php-fpm"] diff --git a/13.0/fpm-alpine/config/apcu.config.php b/13.0/fpm-alpine/config/apcu.config.php new file mode 100644 index 0000000..69fed87 --- /dev/null +++ b/13.0/fpm-alpine/config/apcu.config.php @@ -0,0 +1,4 @@ + '\OC\Memcache\APCu', +); diff --git a/13.0/fpm-alpine/config/apps.config.php b/13.0/fpm-alpine/config/apps.config.php new file mode 100644 index 0000000..a4bed83 --- /dev/null +++ b/13.0/fpm-alpine/config/apps.config.php @@ -0,0 +1,15 @@ + array ( + 0 => array ( + "path" => OC::$SERVERROOT."/apps", + "url" => "/apps", + "writable" => false, + ), + 1 => array ( + "path" => OC::$SERVERROOT."/custom_apps", + "url" => "/custom_apps", + "writable" => true, + ), + ), +); diff --git a/13.0/fpm-alpine/config/autoconfig.php b/13.0/fpm-alpine/config/autoconfig.php new file mode 100644 index 0000000..b759f4d --- /dev/null +++ b/13.0/fpm-alpine/config/autoconfig.php @@ -0,0 +1,34 @@ + 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 "$OC_VersionString";') +fi +image_version=$(php -r 'require "/usr/src/nextcloud/version.php"; echo "$OC_VersionString";') + +if version_greater "$installed_version" "$image_version"; then + echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?" + exit 1 +fi + +if version_greater "$image_version" "$installed_version"; then + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ app:list' > /tmp/list_before + fi + if [[ $EUID -eq 0 ]]; then + rsync_options="-rlDog --chown www-data:root" + else + rsync_options="-rlD" + fi + rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ + + for dir in config data custom_apps themes; do + if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then + rsync $rsync_options --include /"$dir"/ --exclude '/*' /usr/src/nextcloud/ /var/www/html/ + fi + done + + if [ "$installed_version" != "0.0.0~unknown" ]; then + run_as 'php /var/www/html/occ upgrade --no-app-disable' + + run_as 'php /var/www/html/occ app:list' > /tmp/list_after + echo "The following apps have beed disabled:" + diff <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_before) <(sed -n "/Enabled:/,/Disabled:/p" /tmp/list_after) | grep '<' | cut -d- -f2 | cut -d: -f1 + rm -f /tmp/list_before /tmp/list_after + fi +fi + +exec "$@" diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template new file mode 100644 index 0000000..34be0e8 --- /dev/null +++ b/Dockerfile-alpine.template @@ -0,0 +1,111 @@ +FROM php:7.1-%%VARIANT%% + +# entrypoint.sh dependencies +RUN apk add --no-cache \ + bash \ + coreutils \ + rsync + +# 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 \ + 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.9 \ + 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/html; \ + chmod -R g=u /var/www/html + +VOLUME /var/www/html +%%VARIANT_EXTRAS%% + +ENV NEXTCLOUD_VERSION %%VERSION%% + +RUN set -ex; \ + apk add --no-cache --virtual .fetch-deps \ + bzip2 \ + gnupg \ + ; \ + \ + curl -fsSL -o nextcloud.tar.bz2 \ + "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \ + curl -fsSL -o nextcloud.tar.bz2.asc \ + "https://download.nextcloud.com/server/releases/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 entrypoint.sh / +COPY config/* /usr/src/nextcloud/config/ + +ENTRYPOINT ["/entrypoint.sh"] +CMD ["%%CMD%%"] diff --git a/Dockerfile.template b/Dockerfile-debian.template similarity index 100% rename from Dockerfile.template rename to Dockerfile-debian.template diff --git a/update.sh b/update.sh index 2fb6f4c..dfe2170 100755 --- a/update.sh +++ b/update.sh @@ -4,11 +4,19 @@ set -eo pipefail declare -A cmd=( [apache]='apache2-foreground' [fpm]='php-fpm' + [fpm-alpine]='php-fpm' +) + +declare -A base=( + [apache]='debian' + [fpm]='debian' + [fpm-alpine]='alpine' ) declare -A extras=( [apache]='\nRUN a2enmod rewrite' [fpm]='' + [fpm-alpine]='' ) # version_greater_or_equal A B returns whether A >= B @@ -34,11 +42,11 @@ for latest in "${latests[@]}"; do # Only add versions >= 11 if version_greater_or_equal "$version" "11.0"; then - for variant in apache fpm; do + for variant in apache fpm fpm-alpine; do # Create the version+variant directory with a Dockerfile. mkdir -p "$version/$variant" - template="Dockerfile.template" + template="Dockerfile-${base[$variant]}.template" cp "$template" "$version/$variant/Dockerfile" echo "updating $latest [$version] $variant"