From 82275cd20c7e767a7cbcf736e163a31596b5a5c9 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 29 Aug 2022 23:52:24 +0530 Subject: [PATCH 1/6] SED command to add hidden class in 2FA page --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0aedb16a..587c9c22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -158,5 +158,8 @@ RUN curl -fsSL -o eCloud-theme.tar.gz \ # Replace "Get your own free account" NC link with /e/ Account link in public pages RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php +# Set default class of hiddden to settings-hint +RUN sed -i 's/settings-hint/settings-hint hidden/' ${BASE_DIR}/apps/settings/templates/settings/personal/security/twofactor.php + ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] -- GitLab From 35991b8954f6ddcdbccb8d2cde913583a9ea89b1 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 29 Aug 2022 23:57:15 +0530 Subject: [PATCH 2/6] bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 587c9c22..7adf1dda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,9,1/22,2,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,9,2/22,2,9,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 e33a31ebfa18b8e7c9c66f105c0c008b7279dea2 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 30 Aug 2022 00:08:36 +0530 Subject: [PATCH 3/6] bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7adf1dda..4ef8c278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,9,2/22,2,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,9,3/22,2,9,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 e3d2b056a1e19128c47a57e414ddc95b46d692df Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 30 Aug 2022 00:12:31 +0530 Subject: [PATCH 4/6] bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ef8c278..ace804ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,9,3/22,2,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,10,3/22,2,9,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 772fab649ca3aace9850da47a32b3367922a0802 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 30 Aug 2022 00:19:26 +0530 Subject: [PATCH 5/6] bump version #2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ace804ac..41e59896 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,10,3/22,2,9,3/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,9,1/22,2,9,4/' ${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 9b3de6e5656ef22ac85bc7eda0600984c1ee8cec Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 30 Aug 2022 00:22:13 +0530 Subject: [PATCH 6/6] bump version #3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 41e59896..5b32a947 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG ECLOUD_LAUNCHER_JOB_ID="345049" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.4.0" -RUN sed -i 's/22,2,9,1/22,2,9,4/' ${BASE_DIR}/version.php +RUN sed -i 's/22,2,9,1/22,2,10,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