From fc53d47b764414b586e0eaf1ad3f3822d4a61516 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 30 Jun 2023 17:05:58 +0530 Subject: [PATCH 1/3] selfhost 25 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 238cb041..c43543be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -121,7 +121,7 @@ CMD ["php-fpm"] From nextcloud as selfhost ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="selfhost-24.0.10" +ARG THEME_VERSION="25.0.6" ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0" # Patches @@ -177,7 +177,6 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co From selfhost as ecloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" -ARG THEME_VERSION="25.0.6" ARG LDAP_WRITE_SUPPORT_VERSION="1.7.0" ARG OIDC_LOGIN_VERSION="2.5.1" -- GitLab From 3f50de13f5c61d425cdb945e2e74e0bcad1a390d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 13:06:26 +0530 Subject: [PATCH 2/3] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c43543be..b690b6aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SNAPPY_THEME_VERSION="2.0.0" ARG USER_MIGRATION_JOB_ID="608716" ARG MEMORIES_VERSION="5.1.0" -RUN sed -i 's/25,0,6,1/25,0,6,6/' ${BASE_DIR}/version.php +RUN sed -i 's/25,0,6,1/25,0,6,7/' ${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 8865e0292f12842b50236411a5ddf9b97fd61462 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 5 Jul 2023 13:16:22 +0530 Subject: [PATCH 3/3] dashboard fix --- custom_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index 7c7d3f46..77b0d20c 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -29,7 +29,7 @@ if version_greater "$image_version" "$installed_version"; then rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/ rsync $rsync_options --include "/oidc_login/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ - rsync $rsync_options --include "/ecloud-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ + rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/ rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ rsync $rsync_options --include "/Murena/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ -- GitLab