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

Verified Commit 4f0d8c91 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

resolve conflicts

parent e9048cda

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -228,9 +228,9 @@ RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE 
# Custom theme

RUN rm -rf ${BASE_DIR}/themes/eCloud && \

    curl -fsSL -o eCloud-theme.tar.gz \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/dev/nc-25/nextcloud-theme-dev-nc-25.tar.gz" && \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/nextcloud-theme/-/archive/${THEME_VERSION}/nextcloud-theme-${THEME_VERSION}.tar.gz" && \

    tar -xf eCloud-theme.tar.gz -C /tmp/ && \

    mv /tmp/nextcloud-theme-dev-nc-25/ ${BASE_DIR}/themes/eCloud && \

    mv /tmp/nextcloud-theme-${THEME_VERSION}/ ${BASE_DIR}/themes/eCloud && \

    chown -R www-data:www-data ${BASE_DIR}/themes/eCloud/ && \

    rm -rf eCloud-theme.tar.gz ${BASE_DIR}/themes/example/