Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f70da530 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'selfhost-24' into 'main' 

Added dashboard app to selfhost 24

See merge request !156
parents 0a29d52e b310a4be

Dockerfile

+7 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ ARG RAINLOOP_COMMIT_SHA="523518ba" 
ARG EA_JOB_ID="445966"

ARG ECLOUD_LAUNCHER_JOB_ID="458901"

ARG GOOGLE_INTEGRATION_VERSION="1.0.8"

ARG ECLOUD_DASHBOARD_JOB_ID="485170"





RUN sed -i 's/24,0,8,2/24,0,8,5/' ${BASE_DIR}/version.php

RUN sed -i 's/24,0,8,2/24,0,8,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
@@ -94,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

custom_entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -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!"