diff --git a/Dockerfile b/Dockerfile index c44e000efb5b5412bfaa702b3c47a0f96d097e69..e261a593dfccda8be1bc11ff90fdf5d774dc8747 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM nextcloud:19.0.8-fpm ARG BASE_DIR="/usr/src/nextcloud" ARG THEME_VERSION="19.0.8.2" ARG NEWS_VERSION="14.2.2" +ARG QUOTA_WARN_VERSION="1.8.0" +ARG CARNET_VERSION="0.23.7" RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ /tmp/build_patches/ @@ -23,6 +25,16 @@ RUN curl -fsSL -o news.tar.gz \ tar -xf news.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm news.tar.gz; +RUN curl -fsSL -o quota_warning.tar.gz \ + "https://github.com/nextcloud/quota_warning/releases/download/v${QUOTA_WARN_VERSION}/quota_warning-${QUOTA_WARN_VERSION}.tar.gz" && \ + tar -xf quota_warning.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm quota_warning.tar.gz; + +RUN curl -fsSL -o carnet_app.tar.gz \ + "https://github.com/CarnetApp/CarnetNextcloud/releases/download/v${CARNET_VERSION}/carnet-nc-v${CARNET_VERSION}.tar.gz" && \ + tar -xf carnet_app.tar.gz -C ${BASE_DIR}/custom_apps/ && \ + rm carnet_app.tar.gz; + # Custom theme RUN curl -fsSL -o eelo-theme.tar.gz \ "https://gitlab.e.foundation/e/infra/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ @@ -32,4 +44,4 @@ RUN curl -fsSL -o eelo-theme.tar.gz \ rm -rf eelo-theme.tar.gz /tmp/nextcloud-theme-* ${BASE_DIR}/themes/example/ ENTRYPOINT ["/custom_entrypoint.sh"] -CMD ["php-fpm"] \ No newline at end of file +CMD ["php-fpm"] diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index cf055cd980aa3a73ad5d204e983504bd7adb3a28..14925e9c078afb643d6c283c7ede5e0677e4fb5a 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -4,7 +4,9 @@ echo "Custom eCloud entrypoint" rsync_options="-rlDog --chown www-data:www-data --delete" rsync $rsync_options --include "/news/" --exclude '/*' /usr/src/nextcloud/custom_apps/ /var/www/html/custom_apps/ +rsync $rsync_options --include "/quota_warning/" --exclude '/*' /usr/src/nextcloud/custom_apps/ /var/www/html/custom_apps/ +rsync $rsync_options --include "/carnet/" --exclude '/*' /usr/src/nextcloud/custom_apps/ /var/www/html/custom_apps/ rsync $rsync_options --include "/eelo/" --exclude '/*' /usr/src/nextcloud/themes/ /var/www/html/themes/ /entrypoint.sh "$@" -echo "bye bye NC" \ No newline at end of file +echo "bye bye NC"