From 72ec9fb89663ca79793b53ccb5ced7b03dde4f70 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 13 Dec 2022 15:05:08 +0530 Subject: [PATCH 1/4] docker imnage 24.0.8 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f21acb58..ff17ab50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:24.0.7-fpm AS nextcloud +FROM nextcloud:24.0.8-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_HELPER_JOB_ID="446245" @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="445974" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,7,1/24,0,7,11/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,1/24,0,8,1/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From 40faf7431837c05e86c0d48ad31760a6d8b2c6f9 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 13 Dec 2022 16:03:38 +0530 Subject: [PATCH 2/4] notification patch fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff17ab50..fd1f0267 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="445974" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,8,1/24,0,8,1/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,1/24,0,8,2/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images @@ -139,7 +139,7 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # Set default class of hidden to settings-hint RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php # change notifications icon src -RUN sed -i 's/(0,Pd.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js +RUN sed -i 's/(0,Ud.imagePath)("notifications",e)/"\/themes\/"+OC.theme.folder+"\/apps\/notifications\/img\/"+e+".svg"/' ${BASE_DIR}/apps/notifications/js/notifications-main.js RUN sed -i 's/ in Nextcloud/ /' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js RUN sed -i 's/Nextcloud administrator/administrator/' ${BASE_DIR}/custom_apps/integration_google/js/integration_google-personalSettings.js -- GitLab From c50672ad8872e6d1f73a0c3e4b57f1a0e8a980fc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 13 Dec 2022 16:25:47 +0530 Subject: [PATCH 3/4] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd1f0267..003e985b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="445974" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,8,1/24,0,8,2/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,1/24,0,8,3/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab From aa8c512a21d01208216a0e375fed796801ec5c66 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 13 Dec 2022 20:04:07 +0530 Subject: [PATCH 4/4] version fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 003e985b..46246eb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="445974" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" -RUN sed -i 's/24,0,8,1/24,0,8,3/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,8,2/24,0,8,3/' ${BASE_DIR}/version.php COPY custom_entrypoint.sh / RUN chmod +x /custom_entrypoint.sh RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images -- GitLab