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

Commit 03e26191 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'dev/add-user_migration' into 'main' 

Add user migration app

See merge request !169
parents 9a9bea59 bca7e1ba

Dockerfile

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ARG GOOGLE_INTEGRATION_VERSION="1.0.9" 
ARG DASHBOARD_JOB_ID="582062"

ARG SNAPPY_VERSION="2.27.2"

ARG SNAPPY_THEME_VERSION="2.0.0"

ARG USER_MIGRATION_JOB_ID="608716"



RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /
@@ -80,6 +81,12 @@ RUN curl -fsSL -o snappymail.tar.gz \ 
    tar -xf snappymail.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm snappymail.tar.gz;



RUN curl -fsSL -o user_migration.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/user_migration/-/jobs/${USER_MIGRATION_JOB_ID}/artifacts/download" && \

    unzip user_migration.zip && \

    mv dist/user_migration ${BASE_DIR}/custom_apps/ && \

    rm user_migration.zip;



# Fix snappymail icon

RUN sed -i 's/logo-white-64x64.png/app.svg/' ${BASE_DIR}/custom_apps/snappymail/appinfo/info.xml

README.md

+1 −1
Original line number Diff line number Diff line
@@ -60,4 +60,4 @@ We suggest you use our [ecloud-selfhosting](https://gitlab.e.foundation/e/infra/ 


## Contributing



Anyone can fork a project on our GitLab instance, but to prevent abuse it's disabled by default. Get in touch with us [by e-mail](mailto:join@e.email) or through our support channels and we will let you create a fork and submit MRs.
 
Anyone can fork a project on our GitLab instance, but to prevent abuse it's disabled by default. Get in touch with us [by e-mail](mailto:dev@murena.com) or through our support channels and we will let you create a fork and submit MRs.