diff --git a/Dockerfile b/Dockerfile index 2c71207103ac8e9c9adae4304ecf164560bbdff3..d560088b2da6e99cf386916d049abba426b3b21a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,9 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" ARG EA_JOB_ID="433303" ARG ECLOUD_LAUNCHER_JOB_ID="432959" ARG GOOGLE_INTEGRATION_VERSION="1.0.8" +ARG ECLOUD_DASHBOARD_JOB_ID="485170" -RUN sed -i 's/23,0,11,1/23,0,11,12/' ${BASE_DIR}/version.php +RUN sed -i 's/23,0,11,1/23,0,11,22/' ${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 @@ -93,6 +94,11 @@ RUN curl -fsSL -o ecloud-accounts.zip \ mv dist/ecloud-accounts ${BASE_DIR}/custom_apps/ && \ rm ecloud-accounts.zip; +RUN curl -fsSL -o ecloud-dashboard.zip \ + "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-dashboard/-/jobs/${ECLOUD_DASHBOARD_JOB_ID}/artifacts/download" && \ + unzip ecloud-dashboard.zip && \ + mv dist/ecloud-dashboard ${BASE_DIR}/custom_apps/ && \ + rm ecloud-dashboard.zip; # Remove unzip when unzipping is done RUN apt-get -y remove unzip diff --git a/custom_entrypoint.sh b/custom_entrypoint.sh index caaf8d8bb58db80c80105ace7147ab4b56448ac9..718b6fc9df7ce49acdc4dfef96e28d04adbe9d70 100644 --- a/custom_entrypoint.sh +++ b/custom_entrypoint.sh @@ -32,7 +32,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 "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/ else echo "Skipping rsync step as version not updated!" @@ -40,8 +40,10 @@ fi if [ "$(id -u)" = 0 ]; then su -p www-data -s /bin/sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" + su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" else sh -c "php $DST_DIR/occ config:system:set profile.enabled --value=false --type=boolean" + sh -c "php $DST_DIR/occ app:enable ecloud-dashboard" fi /entrypoint.sh "$@"