From 6411178ed2726f646046cefaa8b9bfa508a6c0a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Mon, 22 Feb 2021 09:58:14 +0000
Subject: [PATCH 1/3] Bundle quota_warning app.

---
 Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c44e000e..d444d755 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ 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"
 
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
 COPY patches/ /tmp/build_patches/
@@ -23,6 +24,11 @@ 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;
+
 # 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" && \
-- 
GitLab


From 8efa3e8faff4542bc8257cfea1c846aafc08630b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Mon, 22 Feb 2021 10:04:47 +0000
Subject: [PATCH 2/3] =?UTF-8?q?Also=20rsync=20the=20app=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom_entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh
index cf055cd9..179e31e2 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -4,6 +4,7 @@ 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 "/eelo/" --exclude '/*' /usr/src/nextcloud/themes/ /var/www/html/themes/
 
 /entrypoint.sh "$@"
-- 
GitLab


From 5e592606613bb466e996a0522a3a76bbb6efbcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= <arnauvp@e.email>
Date: Mon, 22 Feb 2021 11:36:21 +0000
Subject: [PATCH 3/3] Bundle also carnet

---
 Dockerfile           | 8 +++++++-
 custom_entrypoint.sh | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d444d755..e261a593 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ 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/
@@ -29,6 +30,11 @@ RUN curl -fsSL -o quota_warning.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" && \
@@ -38,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 179e31e2..14925e9c 100644
--- a/custom_entrypoint.sh
+++ b/custom_entrypoint.sh
@@ -5,7 +5,8 @@ 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"
-- 
GitLab