From 6ef3f5c842ba12622fe275f9e704a037f1795703 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 16 Mar 2023 15:35:08 +0530 Subject: [PATCH 1/2] Add rsync steps to snappy and snappy theme --- custom_entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index f7fe2658..d7f347b7 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -30,8 +30,10 @@ 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 "/ecloud-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/ else echo "Skipping rsync step as version not updated!" fi -- GitLab From 38c3a07ac48791059f85a5b85b8909b21eade290 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 16 Mar 2023 15:37:31 +0530 Subject: [PATCH 2/2] Bump version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d678d064..6f04c60b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG ECLOUD_DASHBOARD_JOB_ID="525503" ARG SNAPPY_VERSION="2.26.3" ARG SNAPPY_THEME_VERSION="1.2.3" -RUN sed -i 's/24,0,10,1/24,0,10,9/' ${BASE_DIR}/version.php +RUN sed -i 's/24,0,10,1/24,0,10,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 -- GitLab