diff --git a/pica-nextcloud/13.0/Dockerfile b/pica-nextcloud/13.0/Dockerfile
deleted file mode 100644
index 2d32b97f0d74014705796f462925aff934976f8e..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/Dockerfile
+++ /dev/null
@@ -1,131 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-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; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod rewrite remoteip ;\
- {\
- echo RemoteIPHeader X-Real-IP ;\
- echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
- echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
- echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
- } > /etc/apache2/conf-available/remoteip.conf;\
- a2enconf remoteip
-
-ENV NEXTCLOUD_VERSION 13.0.1
-
-RUN set -ex; \
- 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
-
-COPY *.sh /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/pica-nextcloud/13.0/config/apache-pretty-urls.config.php b/pica-nextcloud/13.0/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c00cc3a6f5c1de3922ff955afd5f6333e..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/pica-nextcloud/13.0/config/apcu.config.php b/pica-nextcloud/13.0/config/apcu.config.php
deleted file mode 100644
index 69fed876a37564b238262bb854a37a9c7e576279..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/pica-nextcloud/13.0/config/apps.config.php b/pica-nextcloud/13.0/config/apps.config.php
deleted file mode 100644
index a4bed8336e2a706a8e87d5f459b116802da8da3f..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
- "apps_paths" => array (
- 0 => array (
- "path" => OC::$SERVERROOT."/apps",
- "url" => "/apps",
- "writable" => false,
- ),
- 1 => array (
- "path" => OC::$SERVERROOT."/custom_apps",
- "url" => "/custom_apps",
- "writable" => true,
- ),
- ),
-);
diff --git a/pica-nextcloud/13.0/config/autoconfig.php b/pica-nextcloud/13.0/config/autoconfig.php
deleted file mode 100644
index b759f4d1a5ae8001a1a5eefa8b5c2146741ca38c..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/config/autoconfig.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-$autoconfig_enabled = false;
-
-if (getenv('SQLITE_DATABASE')) {
- $AUTOCONFIG["dbtype"] = "sqlite";
- $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG["dbtype"] = "mysql";
- $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
- $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
- $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
- $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG["dbtype"] = "pgsql";
- $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
- $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
- $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
- $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-}
-
-if ($autoconfig_enabled) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-
- if (getenv('NEXTCLOUD_ADMIN_USER') && getenv('NEXTCLOUD_ADMIN_PASSWORD')) {
- $AUTOCONFIG["adminlogin"] = getenv('NEXTCLOUD_ADMIN_USER');
- $AUTOCONFIG["adminpass"] = getenv('NEXTCLOUD_ADMIN_PASSWORD');
- }
-}
diff --git a/pica-nextcloud/13.0/cron.sh b/pica-nextcloud/13.0/cron.sh
deleted file mode 100755
index 4dfa4118170e25f029c60a9fbd8fa9a81dde14e7..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/pica-nextcloud/13.0/entrypoint.sh b/pica-nextcloud/13.0/entrypoint.sh
deleted file mode 100755
index 8f3ac0878e36e03a24fbd26fe733cd02086bf800..0000000000000000000000000000000000000000
--- a/pica-nextcloud/13.0/entrypoint.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-set -eu
-
-# version_greater A B returns whether A > B
-version_greater() {
- [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
-}
-
-# return true if specified directory is empty
-directory_empty() {
- [ -z "$(ls -A "$1/")" ]
-}
-
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su - www-data -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
-installed_version="0.0.0.0"
-if [ -f /var/www/html/version.php ]; then
- # shellcheck disable=SC2016
- installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
-fi
-# shellcheck disable=SC2016
-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.0" ]; then
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
- fi
- if [ "$(id -u)" = 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.0" ]; then
- run_as 'php /var/www/html/occ upgrade --no-app-disable'
-
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
- echo "The following apps have beed disabled:"
- diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
- fi
-fi
-
-exec "$@"
diff --git a/pica-nextcloud/15.0/Dockerfile b/pica-nextcloud/15.0/Dockerfile
deleted file mode 100644
index 4c2c5decb6e9f2febfa89ab06cbfbf92f03d0d1d..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/Dockerfile
+++ /dev/null
@@ -1,146 +0,0 @@
-# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.2-apache-stretch
-
-# 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 \
- libevent-dev \
- libfreetype6-dev \
- libicu-dev \
- libjpeg-dev \
- libldap2-dev \
- libmcrypt-dev \
- libmemcached-dev \
- libpng-dev \
- libpq-dev \
- libxml2-dev \
- libmagickwand-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 \
- opcache \
- pcntl \
- pdo_mysql \
- pdo_pgsql \
- zip \
- ; \
- \
-# pecl will claim success even if one install fails, so we need to perform each install separately
- pecl install APCu-5.1.17; \
- pecl install memcached-3.1.3; \
- pecl install redis-4.3.0; \
- pecl install imagick-3.4.3; \
- \
- docker-php-ext-enable \
- apcu \
- memcached \
- redis \
- imagick \
- ; \
- \
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
- apt-mark auto '.*' > /dev/null; \
- apt-mark manual $savedAptMark; \
- ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
- | awk '/=>/ { print $3 }' \
- | sort -u \
- | xargs -r dpkg-query -S \
- | cut -d: -f1 \
- | sort -u \
- | xargs -rt apt-mark manual; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
- rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://docs.nextcloud.com/server/12/admin_manual/configuration_server/server_tuning.html#enable-php-opcache
-RUN { \
- echo 'opcache.enable=1'; \
- echo 'opcache.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; \
- \
- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
- \
- echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \
- \
- mkdir /var/www/data; \
- chown -R www-data:root /var/www; \
- chmod -R g=u /var/www
-
-VOLUME /var/www/html
-
-RUN a2enmod rewrite remoteip ;\
- {\
- echo RemoteIPHeader X-Real-IP ;\
- echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
- echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
- echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
- } > /etc/apache2/conf-available/remoteip.conf;\
- a2enconf remoteip
-
-ENV NEXTCLOUD_VERSION 15.0.5
-
-RUN set -ex; \
- fetchDeps=" \
- gnupg \
- dirmngr \
- "; \
- apt-get update; \
- apt-get install -y --no-install-recommends $fetchDeps; \
- \
- curl -fsSL -o nextcloud.tar.bz2 \
- "https://download.nextcloud.com/server/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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
- gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
- gpgconf --kill all; \
- rm -r "$GNUPGHOME" nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
- rm -rf /usr/src/nextcloud/updater; \
- mkdir -p /usr/src/nextcloud/data; \
- mkdir -p /usr/src/nextcloud/custom_apps; \
- chmod +x /usr/src/nextcloud/occ; \
- \
- apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
- rm -rf /var/lib/apt/lists/*
-
-COPY *.sh upgrade.exclude /
-COPY config/* /usr/src/nextcloud/config/
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["apache2-foreground"]
diff --git a/pica-nextcloud/15.0/config/apache-pretty-urls.config.php b/pica-nextcloud/15.0/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c00cc3a6f5c1de3922ff955afd5f6333e..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'htaccess.RewriteBase' => '/',
-);
diff --git a/pica-nextcloud/15.0/config/apcu.config.php b/pica-nextcloud/15.0/config/apcu.config.php
deleted file mode 100644
index 69fed876a37564b238262bb854a37a9c7e576279..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/pica-nextcloud/15.0/config/apps.config.php b/pica-nextcloud/15.0/config/apps.config.php
deleted file mode 100644
index a4bed8336e2a706a8e87d5f459b116802da8da3f..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/config/apps.config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$CONFIG = array (
- "apps_paths" => array (
- 0 => array (
- "path" => OC::$SERVERROOT."/apps",
- "url" => "/apps",
- "writable" => false,
- ),
- 1 => array (
- "path" => OC::$SERVERROOT."/custom_apps",
- "url" => "/custom_apps",
- "writable" => true,
- ),
- ),
-);
diff --git a/pica-nextcloud/15.0/config/autoconfig.php b/pica-nextcloud/15.0/config/autoconfig.php
deleted file mode 100644
index 85e02212c4941185c25aa7df72572409ead55d72..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/config/autoconfig.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-$autoconfig_enabled = false;
-
-if (getenv('SQLITE_DATABASE')) {
- $AUTOCONFIG["dbtype"] = "sqlite";
- $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
- $autoconfig_enabled = true;
-} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
- $AUTOCONFIG["dbtype"] = "mysql";
- $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
- $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
- $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
- $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
- $autoconfig_enabled = true;
-} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
- $AUTOCONFIG["dbtype"] = "pgsql";
- $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
- $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
- $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
- $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
- $autoconfig_enabled = true;
-}
-
-if ($autoconfig_enabled) {
- $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX') ?: "";
-
- $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/pica-nextcloud/15.0/config/redis.config.php b/pica-nextcloud/15.0/config/redis.config.php
deleted file mode 100644
index 5df799f2752ea19020f3171fd05941bbc747a3c5..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/config/redis.config.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-if (getenv('REDIS_HOST')) {
- $CONFIG = array (
- 'memcache.distributed' => '\OC\Memcache\Redis',
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => getenv('REDIS_HOST'),
- 'port' => getenv('REDIS_HOST_PORT') ?: 6379,
- ),
- );
-}
-
diff --git a/pica-nextcloud/15.0/cron.sh b/pica-nextcloud/15.0/cron.sh
deleted file mode 100755
index 4dfa4118170e25f029c60a9fbd8fa9a81dde14e7..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/cron.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -eu
-
-exec busybox crond -f -l 0 -L /dev/stdout
diff --git a/pica-nextcloud/15.0/entrypoint.sh b/pica-nextcloud/15.0/entrypoint.sh
deleted file mode 100755
index 6ef2540ebe55fba7466ab2ae933cb847a20c74e2..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/entrypoint.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-set -eu
-
-# version_greater A B returns whether A > B
-version_greater() {
- [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
-}
-
-# return true if specified directory is empty
-directory_empty() {
- [ -z "$(ls -A "$1/")" ]
-}
-
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p www-data -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
-if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
- installed_version="0.0.0.0"
- if [ -f /var/www/html/version.php ]; then
- # shellcheck disable=SC2016
- installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
- fi
- # shellcheck disable=SC2016
- 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
- echo "Initializing nextcloud $image_version ..."
- if [ "$installed_version" != "0.0.0.0" ]; then
- echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
- fi
- if [ "$(id -u)" = 0 ]; then
- rsync_options="-rlDog --chown www-data:root"
- else
- rsync_options="-rlD"
- fi
- rsync $rsync_options --delete --exclude-from=/upgrade.exclude /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
- rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
- echo "Initializing finished"
-
- #install
- if [ "$installed_version" = "0.0.0.0" ]; then
- echo "New nextcloud instance"
-
- if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
- # shellcheck disable=SC2016
- install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
- if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --database-table-prefix "$NEXTCLOUD_TABLE_PREFIX"'
- else
- install_options=$install_options' --database-table-prefix ""'
- fi
- if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
- # shellcheck disable=SC2016
- install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
- fi
-
- install=false
- if [ -n "${SQLITE_DATABASE+x}" ]; then
- echo "Installing with SQLite database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database-name "$SQLITE_DATABASE"'
- install=true
- elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
- echo "Installing with MySQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
- install=true
- elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
- echo "Installing with PostgreSQL database"
- # shellcheck disable=SC2016
- install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
- install=true
- fi
-
- if [ "$install" = true ]; then
- echo "starting nextcloud installation"
- max_retries=10
- try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
- do
- echo "retrying install..."
- try=$((try+1))
- sleep 3s
- done
- if [ "$try" -gt "$max_retries" ]; then
- echo "installing of nextcloud failed!"
- exit 1
- fi
- if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
- echo "setting trusted domains…"
- NC_TRUSTED_DOMAIN_IDX=1
- for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
- DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
- run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
- NC_TRUSTED_DOMAIN_IDX=$(($NC_TRUSTED_DOMAIN_IDX+1))
- done
- fi
- else
- echo "running web-based installer on first connect!"
- fi
- fi
- #upgrade
- else
- run_as 'php /var/www/html/occ upgrade'
-
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
- echo "The following apps have been disabled:"
- diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
- rm -f /tmp/list_before /tmp/list_after
-
- fi
- fi
-fi
-
-exec "$@"
diff --git a/pica-nextcloud/15.0/upgrade.exclude b/pica-nextcloud/15.0/upgrade.exclude
deleted file mode 100644
index 354864da8800b213a020c66bb2b284cf4aca4176..0000000000000000000000000000000000000000
--- a/pica-nextcloud/15.0/upgrade.exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-/config/
-/data/
-/custom_apps/
-/themes/
-/version.php
diff --git a/pica-nextcloud/README.md b/pica-nextcloud/README.md
index a6aecadd2d0fd7feb3fde8dbc15a28a932f7703b..65e504bd272fbe2e1e4ec6fe8a6aec97db5a9b55 100644
--- a/pica-nextcloud/README.md
+++ b/pica-nextcloud/README.md
@@ -3,54 +3,35 @@
Ce dossier contient les ressources nécessaires pour lancer une ou plusieurs instances NextCloud.
Deux instances sont gérées : celle de Picasoft et celle de Compiègne en Transition.
-Celle de Picasoft utilise une image officielle ainsi que MySQL ; celle de CeT utilise une image construite par nos soins et une base PostgreSQL.
+Elles utilisent l'image officielle de NextCloud.
+
+Voir les README des dossiers pour la configuration spécifique.
+
+### Configuration
+
+Quasiment aucune configuration n'est effectuée via les fichiers de ce dépôt, et on préfère l'interface web.
+Le défaut est qu'il n'est pas possible de lancer des instances NextCloud **vraiment** personnalisées depuis ce dépôt, mais c'est parce que le format des fichiers de configuration est amené à évoluer et que NextCloud effectue des migrations automatiques lors des mises à jour.
+
+Versionner les fichiers de configuration serait donc en conflit avec les modifications automatiques effectuées par NextCloud lors des mises à jour et des changements dans l'interface.
+
+Les fichiers `nginx.conf` sont repris de [cet exemple](https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf).
### Lancement
-Pour l'instance de Compiègne en Transition :
-* Copier `cloudcet.secrets.example` dans `cloudcet.secrets` et remplacer les valeurs
-* Lancer `docker-compose -f docker-compose-cet.yml up -d`.
+Pour l'instance de Compiègne en Transition, se rendre dans le dossier [cet](./cet).
+Pour l'instance de Picasoft, se rendre dans le dossier [pica](./pica).
-Pour l'instance de Picasoft :
-* Copier `pica.secrets.example` dans `pica.secrets` et remplacer les valeurs
-* Lancer `docker-compose -f docker-compose-pica.yml up -d`.
+Copier les fichiers `.secrets.example` en `.secrets` et remplacer les valeurs.
+Lancer `docker-compose up -d`.
### Mise à jour
-Pour les prochaines mises à jour du cloud CeT, il est peut être plus pertinent de se baser sur l'image officielle.
-Dans ce cas, supprimer la directive `build` de Compose.
+Pour mettre à jour l'instance de Picasoft, il suffit de mettre à jour le tag de l'image officielle de NextCloud.
-Pour mettre à jour l'instance de Picasoft, il suffit de mettre à jour le tag de l'image de `nextcloud-app`.
-
-Attention : **toutes les mises à jour de version majeure doivent se faire une par une**.
+Attention : **toutes les mises à jour de version majeure doivent se faire une par une**. Les logs applicatifs détaillent la mise à jour.
Exemple :
* 15 -> 16, puis
* 16 -> 17, puis
* 17 -> 18.
Sinon, il y a risque de casse.
-
-### Mise à jour de PostgreSQL (CeT)
-
-Il peut arriver que la version de PostgreSQL ne soit plus supportée par NextCloud.
-Sans en arriver là , il est bon de régulièrement mettre à jour PostgreSQL :
-> While upgrading will always contain some level of risk, PostgreSQL minor releases fix only frequently-encountered bugs, security issues, and data corruption problems to reduce the risk associated with upgrading. For minor releases, the community considers not upgrading to be riskier than upgrading. https://www.postgresql.org/support/versioning/
-
-Les mise à jours mineures (changement du Y de la version X.Y) peuvent se faire sans intervention humaine. On veillera à bien regarder les logs.
-
-En revanche, le passage d'une version majeure à une autre nécessitera une intervention manuelle.
-
-La documentation complète est ici : https://www.postgresql.org/docs/current/upgrading.html
-
-De manière générale, la façon la plus simple est de se rendre dans l'ancien conteneur, de réaliser un `pg_dumpall` et de le copier en lieu sûr (`docker cp`).
-Ensuite, on supprime l'ancien volume de base de données, on relance le nouveau conteneur de base de données (qui sera sans donnée), on monte le fichier de dump, et on lance un `psql -U <user> -d <db> -f <dump_file>` (valeurs de `user` et `db` à matcher avec le fichiers de secrets).
-
-On attend, et **si tout s'est bien passé**, on peut lancer le conteneur applicatif (NextCloud).
-
-### Mise à jour de MariaDB (Picasoft)
-
-[Selon la documentation](https://mariadb.com/kb/en/upgrading-between-major-mariadb-versions/) :
-
-> MariaDB is designed to allow easy upgrades. You should be able to trivially upgrade from ANY earlier MariaDB version to the latest one (for example MariaDB 5.5.x to MariaDB 10.5.x), usually in a few seconds.
-
-L'idée est d'éteindre le conteneur applicatif (NextCloud), puis de lancer la nouvelle version du conteneur, d'entrer dedans, de lancer la commande `mysql_upgrade` et de redémarrer le conteneur.
diff --git a/pica-nextcloud/cet/README.md b/pica-nextcloud/cet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..4106e8194e23eb055b99bc802c187a9c5a4f73cc
--- /dev/null
+++ b/pica-nextcloud/cet/README.md
@@ -0,0 +1,21 @@
+## NextCloud Compiègne en Transition
+
+### Personnalisation
+
+Le thème se configure directement via les paramètres de l'application, en tant qu'administrateur.
+Pour ce faire, se rendre dans Paramètres → Personnaliser l'apparence.
+
+Le fichier [logo.png](./logo.png) est utilisé pour le Logo et le Logo d'en-tête.
+Le fichier [favicon.png](./favicon.png) est utilisé pour le Favicon.
+
+Les CGU sont celles de Picasoft : https://picasoft.net/co/cgu.html
+
+La couleur de fond est `#8CBD8C`.
+
+### Mise à jour de MariaDB
+
+[Selon la documentation](https://mariadb.com/kb/en/upgrading-between-major-mariadb-versions/) :
+
+> MariaDB is designed to allow easy upgrades. You should be able to trivially upgrade from ANY earlier MariaDB version to the latest one (for example MariaDB 5.5.x to MariaDB 10.5.x), usually in a few seconds.
+
+L'idée est d'éteindre le conteneur applicatif (NextCloud), puis de lancer la nouvelle version du conteneur, d'entrer dedans, de lancer la commande `mysql_upgrade` et de redémarrer le conteneur.
diff --git a/pica-nextcloud/docker-compose-cet.yml b/pica-nextcloud/cet/docker-compose.yml
similarity index 93%
rename from pica-nextcloud/docker-compose-cet.yml
rename to pica-nextcloud/cet/docker-compose.yml
index 2ad1b4af6582ac875062d60c06155be03b8d6855..ec26013c8dcd3df6f41c241d2393f8d2b6975ce0 100644
--- a/pica-nextcloud/docker-compose-cet.yml
+++ b/pica-nextcloud/cet/docker-compose.yml
@@ -30,7 +30,7 @@ services:
container_name: cloudcet_web
volumes:
- nextcloud_cet:/var/www/html:ro
- - ./nginx_cet.conf:/etc/nginx/nginx.conf:ro
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
env_file: ./secrets/cloudcet.secrets
labels:
- "traefik.frontend.rule=Host:cloudcet.picasoft.net"
@@ -41,7 +41,7 @@ services:
- nextcloud_cet
depends_on:
- cloudcet
- restart: unless-stopped
+ restart: unless-stopped
cloudcet_db:
container_name: cloudcet_db
diff --git a/pica-nextcloud/cet/favicon.png b/pica-nextcloud/cet/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..754de1de0c782d9df013874af3377097d50fcb31
Binary files /dev/null and b/pica-nextcloud/cet/favicon.png differ
diff --git a/pica-nextcloud/cet/logo.png b/pica-nextcloud/cet/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..bed3db753f615e76ed016d26db3e158ffd3dbe89
Binary files /dev/null and b/pica-nextcloud/cet/logo.png differ
diff --git a/pica-nextcloud/nginx_cet.conf b/pica-nextcloud/cet/nginx.conf
similarity index 100%
rename from pica-nextcloud/nginx_cet.conf
rename to pica-nextcloud/cet/nginx.conf
diff --git a/pica-nextcloud/secrets/cloudcet.secrets.example b/pica-nextcloud/cet/secrets/cloudcet.secrets.example
similarity index 100%
rename from pica-nextcloud/secrets/cloudcet.secrets.example
rename to pica-nextcloud/cet/secrets/cloudcet.secrets.example
diff --git a/pica-nextcloud/pica/README.md b/pica-nextcloud/pica/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..914b426d79e486c49bd87f761b89b487334f8dba
--- /dev/null
+++ b/pica-nextcloud/pica/README.md
@@ -0,0 +1,18 @@
+## NextCloud Picasoft
+
+### Mise à jour de PostgreSQL
+
+Il peut arriver que la version de PostgreSQL ne soit plus supportée par NextCloud.
+Sans en arriver là , il est bon de régulièrement mettre à jour PostgreSQL :
+> While upgrading will always contain some level of risk, PostgreSQL minor releases fix only frequently-encountered bugs, security issues, and data corruption problems to reduce the risk associated with upgrading. For minor releases, the community considers not upgrading to be riskier than upgrading. https://www.postgresql.org/support/versioning/
+
+Les mise à jours mineures (changement du Y de la version X.Y) peuvent se faire sans intervention humaine. On veillera à bien regarder les logs.
+
+En revanche, le passage d'une version majeure à une autre nécessitera une intervention manuelle.
+
+La documentation complète est ici : https://www.postgresql.org/docs/current/upgrading.html
+
+De manière générale, la façon la plus simple est de se rendre dans l'ancien conteneur, de réaliser un `pg_dumpall` et de le copier en lieu sûr (`docker cp`).
+Ensuite, on supprime l'ancien volume de base de données, on relance le nouveau conteneur de base de données (qui sera sans donnée), on monte le fichier de dump, et on lance un `psql -U <user> -d <db> -f <dump_file>` (valeurs de `user` et `db` à matcher avec le fichiers de secrets).
+
+On attend, et **si tout s'est bien passé**, on peut lancer le conteneur applicatif (NextCloud).
diff --git a/pica-nextcloud/docker-compose-pica.yml b/pica-nextcloud/pica/docker-compose.yml
similarity index 100%
rename from pica-nextcloud/docker-compose-pica.yml
rename to pica-nextcloud/pica/docker-compose.yml
diff --git a/pica-nextcloud/nginx.conf b/pica-nextcloud/pica/nginx.conf
similarity index 100%
rename from pica-nextcloud/nginx.conf
rename to pica-nextcloud/pica/nginx.conf
diff --git a/pica-nextcloud/secrets/pica.secrets.example b/pica-nextcloud/pica/secrets/pica.secrets.example
similarity index 100%
rename from pica-nextcloud/secrets/pica.secrets.example
rename to pica-nextcloud/pica/secrets/pica.secrets.example