From 48432884a75d7c0ce644643890bea5a28e4ed01c Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Dec 2022 18:24:25 +0530 Subject: [PATCH 1/4] Bump version --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4235a959..890de3ee 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,7,1/24,0,7,8/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,9/' ${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 @@ -150,7 +150,7 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="24.0.0" +ARG MURENA_THEME_VERSION="24.0.0" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" @@ -207,9 +207,9 @@ RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE # Custom theme RUN curl -fsSL -o eCloud-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${MURENA_THEME_VERSION}/nextcloud-theme-${MURENA_THEME_VERSION}.tar.gz" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ + mv /tmp/nextcloud-theme-${MURENA_THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From 55a3636d1a691b5e44598598a3be74915a083442 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Dec 2022 18:50:31 +0530 Subject: [PATCH 2/4] remove theme before re-adding --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 890de3ee..15be9263 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,7,1/24,0,7,9/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,10/' ${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 @@ -150,7 +150,7 @@ RUN sed -i 's/update/error/g' ${BASE_DIR}/apps/dav/templates/schedule-response-e From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG MURENA_THEME_VERSION="24.0.0" +ARG THEME_VERSION="24.0.0" ARG LDAP_WRITE_SUPPORT_VERSION="1.6.0" ARG OIDC_LOGIN_VERSION="2.4.0" @@ -206,10 +206,11 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_ RUN sed -i '/OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml # Custom theme -RUN curl -fsSL -o eCloud-theme.tar.gz \ - "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${MURENA_THEME_VERSION}/nextcloud-theme-${MURENA_THEME_VERSION}.tar.gz" && \ +RUN rm -rf ${BASE_DIR}/themes/eCloud && \ + curl -fsSL -o eCloud-theme.tar.gz \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \ tar -xf eCloud-theme.tar.gz -C /tmp/ && \ - mv /tmp/nextcloud-theme-${MURENA_THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ + mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \ chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \ rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/ -- GitLab From 82cdb7e1ff71fc8d0c1c359cdb47ba649dc8125d Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Dec 2022 20:29:27 +0530 Subject: [PATCH 3/4] Update helper job id --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15be9263..04ecec24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM nextcloud:24.0.7-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_HELPER_JOB_ID="433795" +ARG THEME_HELPER_JOB_ID="446245" ARG NEWS_VERSION="19.0.0" ARG QUOTA_WARN_VERSION="1.15.0" ARG NOTES_VERSION="4.5.1" -- GitLab From 79e9aa80c08dfa653fbb6f49ec5cc5d21f1ea700 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 1 Dec 2022 20:29:38 +0530 Subject: [PATCH 4/4] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 04ecec24..f21acb58 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,7,1/24,0,7,10/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,7,1/24,0,7,11/' ${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